Merge pull request #814 from DimalChandrasiri/master

Fix for github issue #1064

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

@@ -120,7 +120,7 @@ function triggerError(el,errorMsg){
 function displayErrors(message) {
     $('#error-msg').html(message.responseText);
     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' +
         '</a></div>');
     modalDialog.showAsError();

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

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