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

Fixing issues in group sharing

Browse Source
This commit is contained in:
megala21 2017-05-18 14:17:03 +05:30
parent 3092423d4d
commit 25e0b989d2
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,7 @@ function toTitleCase(str) {
}); });
} }
function htmlspecialchars(text) { function htmlspecialchars(text){
return jQuery('<div/>').text(text).html(); return jQuery('<div/>').text(text).html();
} }
@ -402,17 +402,17 @@ function attachEvents() {
var shareGroupNewRoleFromSelectionLink = $("a#share-group-new-role-from-selection"); var shareGroupNewRoleFromSelectionLink = $("a#share-group-new-role-from-selection");
shareGroupNewRoleFromSelectionLink.click(function () { 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 +534,8 @@ function listAllRoles(groupId) {
html += '</select>'; html += '</select>';
$("#rolesListing").html(html); $("#rolesListing").html(html);
markAlreadySavedUsersRoles(groupId); 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 { } else {
$("#rolesListing").html("No roles available"); $("#rolesListing").html("No roles available");
@ -633,9 +633,6 @@ function displayErrors(jqXHR) {
}); });
} else { } else {
$(modalPopupContent).html($('#group-unexpected-error-content').html()); $(modalPopupContent).html($('#group-unexpected-error-content').html());
if (jqXHR.responseText) {
$('#unexp-error-msg').html(jqXHR.responseText.replace(new RegExp("\"", 'g'), ""));
}
$("a#group-unexpected-error-link").click(function () { $("a#group-unexpected-error-link").click(function () {
hidePopup(); hidePopup();
}); });