Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/META-INF/permissions.xml

@@ -1035,6 +1035,13 @@
         <method>GET</method>
     </Permission>
 
+    <Permission>
+        <name>Group Roles</name>
+        <path>/device-mgt/user/groups/roles</path>
+        <url>/groups/owner/*/name/*/share/roles</url>
+        <method>PUT</method>
+    </Permission>
+
     <Permission>
         <name>Group Permissions</name>
         <path>/device-mgt/admin/groups/roles/permissions</path>

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

@@ -141,24 +141,24 @@ function loadGroups() {
                 render: function ( id, type, row, meta ) {
                     var html;
                     html = '<a href="devices?groupName=' + row.name + '&groupOwner=' + row.owner + '" data-click-event="remove-form" class="btn padding-reduce-on-grid-view">' +
-                        '<span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i><i class="fw fw-view fw-stack-1x"></i></span>' +
-                        '<span class="hidden-xs hidden-on-grid-view">View Devices</span></a>';
+                           '<span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i><i class="fw fw-view fw-stack-1x"></i></span>' +
+                           '<span class="hidden-xs hidden-on-grid-view">View Devices</span></a>';
 
                     html += '<a href="analytics?groupName=' + row.name + '&groupOwner=' + row.owner + '" data-click-event="remove-form" class="btn padding-reduce-on-grid-view">' +
-                        '<span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i><i class="fw fw-statistics fw-stack-1x"></i></span>' +
-                        '<span class="hidden-xs hidden-on-grid-view">Analytics</span></a>';
+                            '<span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i><i class="fw fw-statistics fw-stack-1x"></i></span>' +
+                            '<span class="hidden-xs hidden-on-grid-view">Analytics</span></a>';
 
                     html += '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view share-group-link" data-group-name="' + row.name + '" ' +
-                        'data-group-owner="' + row.owner + '"><span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i><i class="fw fw-share fw-stack-1x"></i></span>' +
-                        '<span class="hidden-xs hidden-on-grid-view">Share</span></a>';
+                            'data-group-owner="' + row.owner + '"><span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i><i class="fw fw-share fw-stack-1x"></i></span>' +
+                            '<span class="hidden-xs hidden-on-grid-view">Share</span></a>';
 
                     html += '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view edit-group-link" data-group-name="' + row.name + '" ' +
-                        'data-group-owner="' + row.owner + '" data-group-description="' + row.description + '"><span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i>' +
-                        '<i class="fw fw-edit fw-stack-1x"></i></span><span class="hidden-xs hidden-on-grid-view">Edit</span></a>';
+                            'data-group-owner="' + row.owner + '" data-group-description="' + row.description + '"><span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i>' +
+                            '<i class="fw fw-edit fw-stack-1x"></i></span><span class="hidden-xs hidden-on-grid-view">Edit</span></a>';
 
                     html += '<a href="#" data-click-event="remove-form" class="btn padding-reduce-on-grid-view remove-group-link" data-group-name="' + row.name + '" ' +
-                        'data-group-owner="' + row.owner + '"><span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i><i class="fw fw-delete fw-stack-1x"></i>' +
-                        '</span><span class="hidden-xs hidden-on-grid-view">Delete</span></a>';
+                            'data-group-owner="' + row.owner + '"><span class="fw-stack"><i class="fw fw-ring fw-stack-2x"></i><i class="fw fw-delete fw-stack-1x"></i>' +
+                            '</span><span class="hidden-xs hidden-on-grid-view">Delete</span></a>';
 
                     return html;
                 }}
@@ -221,12 +221,12 @@ $(document).ready(function () {
 
     /* for device list sorting drop down */
     $(".ctrl-filter-type-switcher").popover(
-            {
-                html: true,
-                content: function () {
-                    return $("#content-filter-types").html();
-                }
+        {
+            html: true,
+            content: function () {
+                return $("#content-filter-types").html();
             }
+        }
     );
 
     /* for data tables*/
@@ -235,20 +235,20 @@ $(document).ready(function () {
     $("[data-toggle=popover]").popover();
 
     $(".ctrl-filter-type-switcher").popover(
-            {
-                html: true,
-                content: function () {
-                    return $('#content-filter-types').html();
-                }
+        {
+            html: true,
+            content: function () {
+                return $('#content-filter-types').html();
             }
+        }
     );
 
     $('#nav').affix(
-            {
-                offset: {
-                    top: $('header').height()
-                }
+        {
+            offset: {
+                top: $('header').height()
             }
+        }
     );
 
 });
@@ -301,12 +301,12 @@ function attachEvents() {
         showPopup();
         $("a#share-group-next-link").hide();
         var userRequest = $.ajax(
-                {
-                    url: "api/user/all",
-                    method: "GET",
-                    contentType: "application/json",
-                    accept: "application/json"
-                }
+            {
+                url: "api/user/all",
+                method: "GET",
+                contentType: "application/json",
+                accept: "application/json"
+            }
         );
         userRequest.done(function (data, txtStatus, jqxhr) {
             var users = JSON.parse(data);
@@ -360,23 +360,23 @@ 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);
                 }
             };
 
             invokerUtil.delete("/devicemgt_admin/groups/owner/" + groupOwner + "/name/" + groupName,
-                               successCallback, function (message) {
-                        displayErrors(message.content);
-                    });
+                successCallback, function (message) {
+                    displayErrors(message.content);
+                });
         });
 
         $("a#remove-group-cancel-link").click(function () {
@@ -405,22 +405,22 @@ 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);
                 }
             };
 
             invokerUtil.put("/devicemgt_admin/groups/owner/" + groupOwner + "/name/" + groupName, group,
-                            successCallback, function (message) {
-                        displayErrors(message.content);
-                    });
+                successCallback, function (message) {
+                    displayErrors(message.content);
+                });
         });
 
         $("a#edit-group-cancel-link").click(function () {
@@ -433,23 +433,23 @@ 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);
         }
     };
 
     invokerUtil.get("/devicemgt_admin/groups/owner/" + groupOwner + "/name/" + groupName + "/share/roles",
-                    successCallback, function (message) {
-                displayErrors(message.content);
-            });
+        successCallback, function (message) {
+            displayErrors(message.content);
+        });
 
     $("a#share-group-w2-cancel-link").click(function () {
         hidePopup();
@@ -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,14 +491,14 @@ function generateRoleMap(groupName, groupOwner, selectedUser, allRoles) {
                 }
             });
         } else {
-            displayErrors(status);
+            displayErrors(xhr);
         }
     };
 
     invokerUtil.get("/devicemgt_admin/groups/owner/" + groupOwner + "/name/" + groupName + "/share/roles?userName=" + selectedUser,
-                    successCallback, function (message) {
-                displayErrors(message.content);
-            });
+        successCallback, function (message) {
+            displayErrors(message.content);
+        });
 
     $("a#share-group-w2-cancel-link").click(function () {
         hidePopup();
@@ -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,14 +516,14 @@ function updateGroupShare(groupName, groupOwner, selectedUser, role) {
                 location.reload(false);
             }, 2000);
         } else {
-            displayErrors(status);
+            displayErrors(xhr);
         }
     };
 
     invokerUtil.put("/devicemgt_admin/groups/owner/" + groupOwner + "/name/" + groupName + "/share/roles?userName=" + selectedUser,
-                    role, successCallback, function (message) {
-                displayErrors(message.content);
-            });
+        role, successCallback, function (message) {
+            displayErrors(message.content);
+        });
 }
 
 function displayErrors(jqXHR) {