community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #814 from DimalChandrasiri/master

Browse Source 
Fix for github issue #1064
This commit is contained in:
Geeth 2017-06-29 12:46:57 +05:30 committed by GitHub
commit c4b92c1fec
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.group.create/public/js/group-add.js
View File

@ -120,7 +120,7 @@ function triggerError(el,errorMsg){
function displayErrors(message) { function displayErrors(message) {
$('#error-msg').html(message.responseText); $('#error-msg').html(message.responseText);
modalDialog.header('Unexpected error occurred!'); modalDialog.header('Unexpected error occurred!');
modalDialog.content('<h4 id="error-msg"></h4>'); modalDialog.content('<h4 id="error-msg">' + message.responseText + '</h4>');
modalDialog.footer('<div class="buttons"><a href="#" id="group-unexpected-error-link" class="btn-operations">Ok' + modalDialog.footer('<div class="buttons"><a href="#" id="group-unexpected-error-link" class="btn-operations">Ok' +
'</a></div>'); '</a></div>');
modalDialog.showAsError(); modalDialog.showAsError();

2
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/public/js/nav-menu.js
View File

@ -37,7 +37,7 @@ function setPopupMaxHeight() {
* show popup function. * show popup function.
*/ */
function showPopup() { function showPopup() {
$(modalPopup).modal('show'); $(modalPopup).first().modal('show');
} }
/* /*