Merge pull request #750 from Megala21/master

Fixing issues in group sharing

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

@@ -402,17 +402,16 @@ function attachEvents() {
 
         var shareGroupNewRoleFromSelectionLink = $("a#share-group-new-role-from-selection");
         shareGroupNewRoleFromSelectionLink.click(function () {
-            var roles = [];
+            var roles = $("#roles").val();
-            $('.modal .roleCheckBoxes').each(
+            if (roles && roles.length >= 2) {
-                function () {
+                addNewRole(roles);
-                    if ($(this).is(':checked')) {
+            } else {
-                        roles.push($(this).data('role-name'));
+                var errorMsgWrapper = "#notification-error-msg";
-                    }
+                var errorMsg = "#notification-error-msg span";
-                }
+                $(errorMsg).text("To create a new role with the combination of roles, at least two roles should be" +
-            );
+                    " selected.");
-            addNewRole(roles);
+                $(errorMsgWrapper).removeClass("hidden");
-            // $(modalPopupContent).html($('#share-group-w3-modal-content').html());
+            }
-            // createNewRole(roles);
         });
     });
 
@@ -534,8 +533,8 @@ function listAllRoles(groupId) {
                 html += '</select>';
                 $("#rolesListing").html(html);
                 markAlreadySavedUsersRoles(groupId);
-                $("select.select2[multiple=multiple]").select2({
+                $("select.select2[multiple=multiple]").select2({tags: false}).on("select2:select", function () {
-                    tags: false
+                    $("#notification-error-msg").addClass("hidden");
                 });
             } else {
                 $("#rolesListing").html("No roles available");