Fixing group roles listing

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js

@@ -360,16 +360,16 @@ function attachEvents() {
         showPopup();
 
         $("a#remove-group-yes-link").click(function () {
-            var successCallback = function (data) {
+            var successCallback = function (data, textStatus, xhr) {
                 data = JSON.parse(data);
-                if (data.status == 200) {
+                if (xhr.status == 200) {
                     $(modalPopupContent).html($('#remove-group-200-content').html());
                     setTimeout(function () {
                         hidePopup();
                         location.reload(false);
                     }, 2000);
                 } else {
-                    displayErrors(status);
+                    displayErrors(xhr);
                 }
             };
 
@@ -405,15 +405,15 @@ function attachEvents() {
             var newGroupDescription = $('#edit-group-description').val();
             var group = {"name": newGroupName, "description": newGroupDescription, "owner": groupOwner};
 
-            var successCallback = function (data) {
+            var successCallback = function (data, textStatus, xhr) {
                 data = JSON.parse(data);
-                if (data.status == 200) {
+                if (xhr.status == 200) {
                     setTimeout(function () {
                         hidePopup();
                         location.reload(false);
                     }, 2000);
                 } else {
-                    displayErrors(status);
+                    displayErrors(xhr);
                 }
             };
 
@@ -433,16 +433,16 @@ function getAllRoles(groupName, groupOwner, selectedUser) {
     $(modalPopupContent).html($('#share-group-w2-modal-content').html());
     $('#user-roles').html('<div style="height:100px" data-state="loading" data-loading-text="Loading..." data-loading-style="icon-only" data-loading-inverse="true"></div>');
     $("a#share-group-yes-link").hide();
-    var successCallback = function (data) {
+    var successCallback = function (data, textStatus, xhr) {
         data = JSON.parse(data);
-        if (data.status == 200) {
-            if (data.data.length > 0) {
-                generateRoleMap(groupName, groupOwner, selectedUser, data.data);
+        if (xhr.status == 200) {
+            if (data.length > 0) {
+                generateRoleMap(groupName, groupOwner, selectedUser, data);
             } else {
                 $('#user-roles').html("There is no any roles for this group.");
             }
         } else {
-            displayErrors(status);
+            displayErrors(xhr);
         }
     };
 
@@ -457,10 +457,10 @@ function getAllRoles(groupName, groupOwner, selectedUser) {
 }
 
 function generateRoleMap(groupName, groupOwner, selectedUser, allRoles) {
-    var successCallback = function (data) {
+    var successCallback = function (data, textStatus, xhr) {
         data = JSON.parse(data);
-        if (data.status == 200) {
-            var userRoles = data.data;
+        if (xhr.status == 200) {
+            var userRoles = data;
             var roleMap = [];
             var str = '';
             var isChecked = '';
@@ -474,20 +474,15 @@ function generateRoleMap(groupName, groupOwner, selectedUser, allRoles) {
                         break;
                     }
                 }
+                roleMap.push(objRole);
                 str += '<label class="checkbox-text"><input type="checkbox" id="user-role-' + roleMap[role].role + '" value="' + roleMap[role].role
                        + '" ' + isChecked + '/>' + roleMap[role].role + '</label>&nbsp;&nbsp;&nbsp;&nbsp;';
-                roleMap.push(objRole);
             }
 
             $('#user-roles').html(str);
             $("a#share-group-yes-link").show();
-            var isOngoing;
+            $("a#share-group-yes-link").show();
             $("a#share-group-yes-link").click(function () {
-                if (isOngoing) {
-                    return false;
-                }
-                $("a#share-group-yes-link").html("Wait...");
-                isOngoing = true;
                 for (var role in roleMap) {
                     if ($('#user-role-' + roleMap[role].role).is(':checked') != roleMap[role].assigned) {
                         roleMap[role].assigned = $('#user-role-' + roleMap[role].role).is(':checked');
@@ -496,7 +491,7 @@ function generateRoleMap(groupName, groupOwner, selectedUser, allRoles) {
                 }
             });
         } else {
-            displayErrors(status);
+            displayErrors(xhr);
         }
     };
 
@@ -511,9 +506,9 @@ function generateRoleMap(groupName, groupOwner, selectedUser, allRoles) {
 }
 
 function updateGroupShare(groupName, groupOwner, selectedUser, role) {
-    var successCallback = function (data) {
+    var successCallback = function (data, textStatus, xhr) {
         data = JSON.parse(data);
-        var status = data.status;
+        var status = xhr.status;
         if (status == 200) {
             $(modalPopupContent).html($('#share-group-200-content').html());
             setTimeout(function () {
@@ -521,7 +516,7 @@ function updateGroupShare(groupName, groupOwner, selectedUser, role) {
                 location.reload(false);
             }, 2000);
         } else {
-            displayErrors(status);
+            displayErrors(xhr);
         }
     };