gCubeSystem
/
UsersManagementPortlet-portlet
16
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

now revoked or assigned roles arrive to the server, still to be managed

This commit is contained in:
Massimiliano Assante 2021-05-12 19:11:24 +02:00
parent 51620bc664
commit 5cb7bbb3a1
3 changed files with 877 additions and 836 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/gr/cite/bluebridge/portlets/admin/usersmanagementportlet/UsersManagementPortletHome.java
View File

@ -74,6 +74,7 @@ public class UsersManagementPortletHome extends GenericPortlet {
private static final int DELETE_SITE_TEAMS_TABLE = 0; private static final int DELETE_SITE_TEAMS_TABLE = 0;
private static final int MASS_EDIT_USERS = 0; private static final int MASS_EDIT_USERS = 0;
private static final int ASSIGN_ROLES_TO_USERS = 1; private static final int ASSIGN_ROLES_TO_USERS = 1;
private static final int REMOVE_ROLES_TO_USERS = 3;
private static final int ASSIGN_TEAMS_TO_USERS = 2; private static final int ASSIGN_TEAMS_TO_USERS = 2;
public void init() { public void init() {
@ -557,9 +558,17 @@ public class UsersManagementPortletHome extends GenericPortlet {
HttpServletRequest httpServletRequest = PortalUtil.getHttpServletRequest(request); HttpServletRequest httpServletRequest = PortalUtil.getHttpServletRequest(request);
_log.debug("Editing users for the group: " + groupName); _log.debug("*** \n\n Editing users for the context: " + groupName);
System.out.println("\n\n****");
System.out.println("long[] usersIDs="+usersIDs.toString());
System.out.println("String[] theRoles="+theRoles.toString());
System.out.println("deletePreviousRoles?="+deletePreviousRoles);
System.out.println("selfId="+selfId);
System.out.println("int typeOfChangesUpponUserMode is="+typeOfChangesUpponUserMode);
if(usersIDs.length == 1){//You can delete previous roles of a single user only. System.out.println("usersIDs.length="+usersIDs.length);
if(usersIDs.length == 1) {//You can delete previous roles of a single user only.
GCubeUser gcu = lum.getUserById(usersIDs[0]); GCubeUser gcu = lum.getUserById(usersIDs[0]);
long[] roleIDs = new long[theRoles.length]; long[] roleIDs = new long[theRoles.length];
GCubeRole[] gCubeRoles = new GCubeRole[theRoles.length]; GCubeRole[] gCubeRoles = new GCubeRole[theRoles.length];
@ -572,20 +581,12 @@ public class UsersManagementPortletHome extends GenericPortlet {
newRoleIDs[i] = gCubeRoles[i].getRoleId(); newRoleIDs[i] = gCubeRoles[i].getRoleId();
} }
if(deletePreviousRoles && typeOfChangesUpponUserMode == MASS_EDIT_USERS){ if(typeOfChangesUpponUserMode == REMOVE_ROLES_TO_USERS){
_log.debug("MASS_EDIT_USERS"); System.out.println("\n\n\n ****** REMOVE_ROLES_TO_USERS");
try{
lrm.removeAllRolesFromUser(gcu.getUserId(), groupId);
}catch(Exception e){
e.printStackTrace();
}
// List<GCubeTeam> teams = lrm.listTeamsByGroup(groupId); }
// if(teams.size() > 0 ){ else if(typeOfChangesUpponUserMode == ASSIGN_ROLES_TO_USERS){
// lrm.deleteUserTeams(gcu.getUserId(), teams); _log.info("\n\n\n ****** ASSIGN_ROLES_TO_USERS");
// }
} else if(deletePreviousRoles && typeOfChangesUpponUserMode == ASSIGN_ROLES_TO_USERS){
_log.debug("ASSIGN_ROLES_TO_USERS");
try{ try{
lrm.removeAllRolesFromUser(gcu.getUserId(), groupId); lrm.removeAllRolesFromUser(gcu.getUserId(), groupId);
}catch(Exception e){ }catch(Exception e){
@ -599,7 +600,7 @@ public class UsersManagementPortletHome extends GenericPortlet {
String[] gCubeTeamNames = new String[usersTeams.length]; String[] gCubeTeamNames = new String[usersTeams.length];
StringBuffer teamNames = new StringBuffer(); StringBuffer teamNames = new StringBuffer();
for(int i=0; i<usersTeams.length; i++){ for (int i=0; i<usersTeams.length; i++) {
GCubeTeam team = null; GCubeTeam team = null;
try { try {
team = lrm.getTeam(groupId, usersTeams[i].trim()); team = lrm.getTeam(groupId, usersTeams[i].trim());
@ -706,7 +707,10 @@ public class UsersManagementPortletHome extends GenericPortlet {
} }
_log.debug("User: " + currentUser.getUsername() + " is editing the roles of user: "+ gcu.getUsername() + " for the site: " + groupName + "and deletes all previous site-roles"); _log.debug("User: " + currentUser.getUsername() + " is editing the roles of user: "+ gcu.getUsername() + " for the site: " + groupName + "and deletes all previous site-roles");
}else{
} //END EDIT ROLES
else {
List<GCubeTeam> existingGCubeTeams = lrm.listTeamsByGroup(groupId); List<GCubeTeam> existingGCubeTeams = lrm.listTeamsByGroup(groupId);

462
src/main/webapp/js/tableEvents.js
View File

@ -2,11 +2,11 @@ function screenToTheLeft() {
var width = $('div#usersRequestsModal div.modal-body').width(); var width = $('div#usersRequestsModal div.modal-body').width();
width = '' + width + 'px'; width = '' + width + 'px';
$('div#requestsAcceptanceContainer').animate({ $('div#requestsAcceptanceContainer').animate({
left : width left: width
}, '2500', function() { }, '2500', function() {
$('div#requestsAcceptanceContainer').toggleClass('hideSection'); $('div#requestsAcceptanceContainer').toggleClass('hideSection');
$('div#usersRequestsTableContainer').toggleClass('hideSection').css({ $('div#usersRequestsTableContainer').toggleClass('hideSection').css({
right : '0px' right: '0px'
}); });
$('table#usersRequestsTable').DataTable().columns.adjust().draw(); $('table#usersRequestsTable').DataTable().columns.adjust().draw();
$('table#usersRequestsTable').DataTable().columns.adjust().responsive.recalc(); $('table#usersRequestsTable').DataTable().columns.adjust().responsive.recalc();
@ -39,45 +39,45 @@ $('#usersRequestsModal #closeUsersRolesModal').off().on(
}); });
//TODO //TODO
$('#singleTag').off('click').on('click', function(){ $('#singleTag').off('click').on('click', function() {
deletePreviousRoles = $('#singleTag').prop('checked'); deletePreviousRoles = $('#singleTag').prop('checked');
if(deletePreviousRoles){ if (deletePreviousRoles) {
$('#changeUsersRolesModal .row:not(:first) .text-tag').remove(); $('#changeUsersRolesModal .row:not(:first) .text-tag').remove();
} }
}); });
$('#singleTagInAssignUsersToGroupsModal').off('click').on('click', function(){ $('#singleTagInAssignUsersToGroupsModal').off('click').on('click', function() {
deletePreviousRoles = $('#singleTagInAssignUsersToGroupsModal').prop('checked'); deletePreviousRoles = $('#singleTagInAssignUsersToGroupsModal').prop('checked');
if(deletePreviousRoles){ if (deletePreviousRoles) {
$('#assignUsersToGroupsModal .row:not(:first) .text-tag').remove(); $('#assignUsersToGroupsModal .row:not(:first) .text-tag').remove();
} }
}); });
$('#singleTagInAssignRolesModal').off('click').on('click', function(){ $('#singleTagInAssignRolesModal').off('click').on('click', function() {
deletePreviousRoles = $('#singleTagInAssignRolesModal').prop('checked'); deletePreviousRoles = $('#singleTagInAssignRolesModal').prop('checked');
if(deletePreviousRoles){ if (deletePreviousRoles) {
$('#assignUsersRolesModal .row:not(:first) .text-tag').remove(); $('#assignUsersRolesModal .row:not(:first) .text-tag').remove();
} }
}); });
function tableEvents() { function tableEvents() {
//Press all column-title, select all, deselect all //Press all column-title, select all, deselect all
$('table:not(#GroupTeamsTableUsers):not(#GroupTeamsTable):not(#rejectedUsersRequestsTable) thead th:first-of-type').off('click').on('click', function(){ $('table:not(#GroupTeamsTableUsers):not(#GroupTeamsTable):not(#rejectedUsersRequestsTable) thead th:first-of-type').off('click').on('click', function() {
var $table = $(this).closest('table'); var $table = $(this).closest('table');
var $rows = $table.find('tbody tr'); var $rows = $table.find('tbody tr');
var rowsCount = $rows.length; var rowsCount = $rows.length;
var rowsCellsCount = $rows.find('td').length; var rowsCellsCount = $rows.find('td').length;
//If 0 rows do nothing //If 0 rows do nothing
if(rowsCellsCount > 1){ if (rowsCellsCount > 1) {
$(this).toggleClass('none'); $(this).toggleClass('none');
if($(this).hasClass('none')){ if ($(this).hasClass('none')) {
// $(this).find('div').text('none'); // $(this).find('div').text('none');
// $(this).find('div').css('padding-left','0px'); // $(this).find('div').css('padding-left','0px');
$rows.addClass('selected'); $rows.addClass('selected');
$rows.find('.icon-ok').addClass('whiteFont'); $rows.find('.icon-ok').addClass('whiteFont');
@ -98,19 +98,19 @@ function tableEvents() {
} }
//If currentusres table show toolbar //If currentusres table show toolbar
if($table.attr('id')==='CurrentUsersTable'){ if ($table.attr('id') === 'CurrentUsersTable') {
// $('div#toolbar').removeClass('hiddenToolbar').addClass('shownToolbar'); // $('div#toolbar').removeClass('hiddenToolbar').addClass('shownToolbar');
$('span#numOfSelectedRusersRequestsDataForEditingows').text(rowsCount); $('span#numOfSelectedRusersRequestsDataForEditingows').text(rowsCount);
$('span#numOfSelectedRows').text(rowsCount); $('span#numOfSelectedRows').text(rowsCount);
$('div#toolbar').animate({height:'show'}); $('div#toolbar').animate({ height: 'show' });
}else if($table.attr('id')==='usersRequestsTable'){ } else if ($table.attr('id') === 'usersRequestsTable') {
// $('div#usersRequestsTableToolbarContainer').removeClass('hiddenToolbar').addClass('shownToolbar'); // $('div#usersRequestsTableToolbarContainer').removeClass('hiddenToolbar').addClass('shownToolbar');
$('span#numOfSelectedRowsUserReqs').text(rowsCount); $('span#numOfSelectedRowsUserReqs').text(rowsCount);
$('div#usersRequestsTableToolbarContainer').animate({height:'show'}); $('div#usersRequestsTableToolbarContainer').animate({ height: 'show' });
usersRequestsDataForEditing = []; usersRequestsDataForEditing = [];
var index = 0; var index = 0;
$.each($('#usersRequestsTable tr.selected td:nth-child(3)'), function(){ $.each($('#usersRequestsTable tr.selected td:nth-child(3)'), function() {
var theData = $($table var theData = $($table
.dataTable() .dataTable()
@ -121,26 +121,26 @@ function tableEvents() {
index++; index++;
}); });
}else if($table.attr('id')==='GroupTeamsTable'){ } else if ($table.attr('id') === 'GroupTeamsTable') {
$('#usersManagementPortletContainerSiteTeamsEditMode #groupTeamsTableToolbarContainer').removeClass('hiddenToolbar').addClass('shownToolbar'); $('#usersManagementPortletContainerSiteTeamsEditMode #groupTeamsTableToolbarContainer').removeClass('hiddenToolbar').addClass('shownToolbar');
} }
}else{ } else {
// $(this).find('div').text('all') // $(this).find('div').text('all')
// $(this).find('div').css('padding-left','8px'); // $(this).find('div').css('padding-left','8px');
$rows.removeClass('selected'); $rows.removeClass('selected');
$rows.find('.icon-ok').removeClass('whiteFont'); $rows.find('.icon-ok').removeClass('whiteFont');
//If currentusres table hide toolbar //If currentusres table hide toolbar
if($table.attr('id')==='CurrentUsersTable'){ if ($table.attr('id') === 'CurrentUsersTable') {
// $('div#toolbar').addClass('hiddenToolbar').removeClass('shownToolbar'); // $('div#toolbar').addClass('hiddenToolbar').removeClass('shownToolbar');
$('span#numOfSelLectedRows').text(''); $('span#numOfSelLectedRows').text('');
$('div#toolbar').animate({height:'hide'}); $('div#toolbar').animate({ height: 'hide' });
}else if($table.attr('id')==='usersRequestsTable'){ } else if ($table.attr('id') === 'usersRequestsTable') {
// $('div#usersRequestsTableToolbarContainer').addClass('hiddenToolbar').removeClass('shownToolbar'); // $('div#usersRequestsTableToolbarContainer').addClass('hiddenToolbar').removeClass('shownToolbar');
$('span#numOfSelectedRowsUserReqs').text(''); $('span#numOfSelectedRowsUserReqs').text('');
$('div#usersRequestsTableToolbarContainer').animate({height:'hide'}); $('div#usersRequestsTableToolbarContainer').animate({ height: 'hide' });
}else if($table.attr('id')==='GroupTeamsTable'){ } else if ($table.attr('id') === 'GroupTeamsTable') {
$('#usersManagementPortletContainerSiteTeamsEditMode #groupTeamsTableToolbarContainer').addClass('hiddenToolbar').removeClass('shownToolbar'); $('#usersManagementPortletContainerSiteTeamsEditMode #groupTeamsTableToolbarContainer').addClass('hiddenToolbar').removeClass('shownToolbar');
} }
} }
@ -148,19 +148,19 @@ function tableEvents() {
}); });
$('#userNamesList').textext({ $('#userNamesList').textext({
plugins : ' tags' plugins: ' tags'
}); });
$('#userNamesListInAssignRolesModal').textext({ $('#userNamesListInAssignRolesModal').textext({
plugins : ' tags' plugins: ' tags'
}); });
$('#userNamesListInRemoveRolesModal').textext({ $('#userNamesListInRemoveRolesModal').textext({
plugins : ' tags' plugins: ' tags'
}); });
$('#roleListInRemoveRolesModal').textext({ $('#roleListInRemoveRolesModal').textext({
plugins : ' tags' plugins: ' tags'
}); });
$('#userNamesListInAssignUsersToGroupsModal').textext({ $('#userNamesListInAssignUsersToGroupsModal').textext({
plugins : ' tags' plugins: ' tags'
}); });
$('span#textAboveTagsInput div.row div.text-core:first').addClass('span9'); $('span#textAboveTagsInput div.row div.text-core:first').addClass('span9');
@ -191,8 +191,8 @@ function tableEvents() {
// $('#userNamesList').parent().find('div.text-tag').addClass('span4'); // $('#userNamesList').parent().find('div.text-tag').addClass('span4');
$('#userNamesListInAssignRolesModal').parent().find('div.text-button').addClass( $('#userNamesListInAssignRolesModal').parent().find('div.text-button').addClass(
'span12'); 'span12');
$('#userNamesListInAssignRolesModal').parent().find('a.text-remove').html('<i class="fa fa-times"></i>') // $('#userNamesListInAssignRolesModal').parent().find('a.text-remove').html('<i class="fa fa-times"></i>')
.removeClass('text-remove').addClass('tag-remove'); // .removeClass('text-remove').addClass('tag-remove');
}); });
$('#userNamesListInRemoveRolesModal').parent().find('div.text-tags').unbind().bind( $('#userNamesListInRemoveRolesModal').parent().find('div.text-tags').unbind().bind(
@ -205,8 +205,8 @@ function tableEvents() {
// $('#userNamesList').parent().find('div.text-tag').addClass('span4'); // $('#userNamesList').parent().find('div.text-tag').addClass('span4');
$('#userNamesListInRemoveRolesModal').parent().find('div.text-button').addClass( $('#userNamesListInRemoveRolesModal').parent().find('div.text-button').addClass(
'span12'); 'span12');
$('#userNamesListInRemoveRolesModal').parent().find('a.text-remove').html('<i class="fa fa-times"></i>') // $('#userNamesListInRemoveRolesModal').parent().find('a.text-remove').html('<i class="fa fa-times"></i>')
.removeClass('text-remove').addClass('tag-remove'); // .removeClass('text-remove').addClass('tag-remove');
}); });
$('#userNamesList').parent().find('div.text-tags').unbind().bind( $('#userNamesList').parent().find('div.text-tags').unbind().bind(
@ -317,8 +317,8 @@ function tableEvents() {
// $('#roleList').parent().find('div.text-tag').addClass('span5'); // $('#roleList').parent().find('div.text-tag').addClass('span5');
$('#roleListInAssignRolesModal').parent().find('div.text-button').addClass( $('#roleListInAssignRolesModal').parent().find('div.text-button').addClass(
'span12'); 'span12');
$('#roleListInAssignRolesModal').parent().find('a.text-remove').html('<i class="fa fa-times"></i>') // $('#roleListInAssignRolesModal').parent().find('a.text-remove').html('<i class="fa fa-times"></i>')
.removeClass('text-remove').addClass('tag-remove'); // .removeClass('text-remove').addClass('tag-remove');
$('textarea#roleListInAssignRolesModal').parent().find('a.tag-remove').off().on( $('textarea#roleListInAssignRolesModal').parent().find('a.tag-remove').off().on(
'click', function() { 'click', function() {
$(this).closest('.text-tag').remove(); $(this).closest('.text-tag').remove();
@ -387,24 +387,24 @@ function tableEvents() {
var countSelectedRows = $('table#CurrentUsersTable tr.selected').length; var countSelectedRows = $('table#CurrentUsersTable tr.selected').length;
var countTableCells = $('table#CurrentUsersTable tbody tr td').length; var countTableCells = $('table#CurrentUsersTable tbody tr td').length;
if (countTableCells > 1 && countSelectedRows > 0/* && !$('div#toolbar').hasClass('openToolbar')*/) { if (countTableCells > 1 && countSelectedRows > 0/* && !$('div#toolbar').hasClass('openToolbar')*/) {
// $('div#toolbar').removeClass('hiddenToolbar') // $('div#toolbar').removeClass('hiddenToolbar')
// .addClass('shownToolbar');//initially it was just hiding the toolbar, not displaying none // .addClass('shownToolbar');//initially it was just hiding the toolbar, not displaying none
$('div#toolbar').animate({height:'show'}); $('div#toolbar').animate({ height: 'show' });
$('div#toolbar').addClass('openToolbar'); $('div#toolbar').addClass('openToolbar');
$('span#numOfSelectedRows').text(countSelectedRows); $('span#numOfSelectedRows').text(countSelectedRows);
} else if(countSelectedRows === 0){ } else if (countSelectedRows === 0) {
// $('div#toolbar').addClass('hiddenToolbar') // $('div#toolbar').addClass('hiddenToolbar')
// .removeClass('shownToolbar');//initially it was just hiding the toolbar, not displaying none // .removeClass('shownToolbar');//initially it was just hiding the toolbar, not displaying none
$('div#toolbar').removeClass('openToolbar'); $('div#toolbar').removeClass('openToolbar');
$('span#numOfSelLectedRows').text(''); $('span#numOfSelLectedRows').text('');
$('div#toolbar').animate({height:'hide'}); $('div#toolbar').animate({ height: 'hide' });
} }
//now it toggles it toggles it up and down //now it toggles it toggles it up and down
var countTableRows = $('table#CurrentUsersTable tbody tr').length; var countTableRows = $('table#CurrentUsersTable tbody tr').length;
if(countTableRows === countSelectedRows){ if (countTableRows === countSelectedRows) {
$('#CurrentUsersTable th:first').addClass('none'); $('#CurrentUsersTable th:first').addClass('none');
}else { } else {
$('#CurrentUsersTable th:first').removeClass('none'); $('#CurrentUsersTable th:first').removeClass('none');
} }
} }
@ -436,26 +436,26 @@ function tableEvents() {
var countSelectedRows = $('table#usersRequestsTable tr.selected').length; var countSelectedRows = $('table#usersRequestsTable tr.selected').length;
var countTableCells = $('table#usersRequestsTable tbody tr td').length; var countTableCells = $('table#usersRequestsTable tbody tr td').length;
if (countTableCells > 1 && countSelectedRows > 0/* && !$('div#usersRequestsTableToolbarContainer').hasClass('openToolbar')*/) { if (countTableCells > 1 && countSelectedRows > 0/* && !$('div#usersRequestsTableToolbarContainer').hasClass('openToolbar')*/) {
// $('div#usersRequestsTableToolbarContainer') // $('div#usersRequestsTableToolbarContainer')
// .removeClass('hiddenToolbar').addClass( // .removeClass('hiddenToolbar').addClass(
// 'shownToolbar'); // 'shownToolbar');
$('div#usersRequestsTableToolbarContainer').animate({height:'show'}); $('div#usersRequestsTableToolbarContainer').animate({ height: 'show' });
$('div#usersRequestsTableToolbarContainer').addClass('openToolbar'); $('div#usersRequestsTableToolbarContainer').addClass('openToolbar');
$('span#numOfSelectedRowsUserReqs').text( $('span#numOfSelectedRowsUserReqs').text(
countSelectedRows); countSelectedRows);
} else if(countSelectedRows === 0){ } else if (countSelectedRows === 0) {
// $('div#usersRequestsTableToolbarContainer') // $('div#usersRequestsTableToolbarContainer')
// .addClass('hiddenToolbar').removeClass( // .addClass('hiddenToolbar').removeClass(
// 'shownToolbar'); // 'shownToolbar');
$('div#usersRequestsTableToolbarContainer').animate({height:'hide'}); $('div#usersRequestsTableToolbarContainer').animate({ height: 'hide' });
$('div#usersRequestsTableToolbarContainer').removeClass('openToolbar'); $('div#usersRequestsTableToolbarContainer').removeClass('openToolbar');
$('span#numOfSelectedRowsUserReqs').text(''); $('span#numOfSelectedRowsUserReqs').text('');
} }
var countTableRows = $('table#usersRequestsTable tbody tr').length; var countTableRows = $('table#usersRequestsTable tbody tr').length;
if(countTableRows === countSelectedRows){ if (countTableRows === countSelectedRows) {
$('#usersRequestsTable th:first').addClass('none'); $('#usersRequestsTable th:first').addClass('none');
}else { } else {
$('#usersRequestsTable th:first').removeClass('none'); $('#usersRequestsTable th:first').removeClass('none');
} }
}); });
@ -464,9 +464,9 @@ function tableEvents() {
$('#usersManagementPortletContainer .selected').removeClass('selected'); $('#usersManagementPortletContainer .selected').removeClass('selected');
$('#usersManagementPortletContainer .whiteFont').removeClass('whiteFont'); $('#usersManagementPortletContainer .whiteFont').removeClass('whiteFont');
$('#CurrentUsersTable th:first').removeClass('none'); $('#CurrentUsersTable th:first').removeClass('none');
// $('div#toolbar').addClass('hiddenToolbar').removeClass('shownToolbar'); // $('div#toolbar').addClass('hiddenToolbar').removeClass('shownToolbar');
$('div#toolbar').removeClass('openToolbar'); $('div#toolbar').removeClass('openToolbar');
$('div#toolbar').animate({height:'hide'}); $('div#toolbar').animate({ height: 'hide' });
}); });
$('#usersManagementPortletContainer div.toolbarContainer').off().on( $('#usersManagementPortletContainer div.toolbarContainer').off().on(
@ -607,12 +607,12 @@ function tableEvents() {
} }
var tags = $('textarea#userNamesListInAssignUsersToGroupsModal').parent().find( var tags = $('textarea#userNamesListInAssignUsersToGroupsModal').parent().find(
'div.text-tags div.text-tag'); 'div.text-tags div.text-tag');
if (tags.length > 0 && !filterUserTableByUsersThatDontBelongInAGroup){ if (tags.length > 0 && !filterUserTableByUsersThatDontBelongInAGroup) {
tags.remove();// Remove previous tags tags.remove();// Remove previous tags
}else if(filterUserTableByUsersThatDontBelongInAGroup){ } else if (filterUserTableByUsersThatDontBelongInAGroup) {
tags.remove(); tags.remove();
// If the user presses add to group from the toolbar the groupname by which // If the user presses add to group from the toolbar the groupname by which
// he searched must be available in the modal // he searched must be available in the modal
var tags = []; var tags = [];
tags.push($('#teamNameHeader').text()); tags.push($('#teamNameHeader').text());
$('#teamsListInAssignUsersToGroupsModal').textext()[0].tags().addTags(tags); $('#teamsListInAssignUsersToGroupsModal').textext()[0].tags().addTags(tags);
@ -652,7 +652,7 @@ function tableEvents() {
for (var i = 0; i < selectedRows.length; i++) { for (var i = 0; i < selectedRows.length; i++) {
var isSelf = $('table#CurrentUsersTable').dataTable().fnGetData(selectedRows[i]).isSelf; var isSelf = $('table#CurrentUsersTable').dataTable().fnGetData(selectedRows[i]).isSelf;
var isSelfText = $($.parseHTML(isSelf)).text(); var isSelfText = $($.parseHTML(isSelf)).text();
if(isSelfText === "true") { if (isSelfText === "true") {
$('#deleteUsersFromCurrentSiteModal').modal('hide'); $('#deleteUsersFromCurrentSiteModal').modal('hide');
$('#cannotRemoveSelfModal').modal('show'); $('#cannotRemoveSelfModal').modal('show');
return; return;
@ -669,12 +669,12 @@ function tableEvents() {
fetchAllCurrentUsers(deleteMode, deleteUsers, userIDs, fetchAllCurrentUsers(deleteMode, deleteUsers, userIDs,
roles, [], deletePreviousRoles, reqIDs, roles, [], deletePreviousRoles, reqIDs,
sendDismissalEmail); sendDismissalEmail);
// $('div#toolbar').addClass('hiddenToolbar').removeClass( // $('div#toolbar').addClass('hiddenToolbar').removeClass(
// 'shownToolbar'); // 'shownToolbar');
$('#deleteUsersFromCurrentSiteModal').modal('hide'); $('#deleteUsersFromCurrentSiteModal').modal('hide');
// $('#sendAutomaticRejectionEmail').prop('checked', false); // $('#sendAutomaticRejectionEmail').prop('checked', false);
$('div#toolbar').removeClass('openToolbar'); $('div#toolbar').removeClass('openToolbar');
$('div#toolbar').animate({height:'hide'}); $('div#toolbar').animate({ height: 'hide' });
$('#CurrentUsersTable th:first').removeClass('none'); $('#CurrentUsersTable th:first').removeClass('none');
}); });
@ -706,11 +706,11 @@ function tableEvents() {
var teams = table.dataTable().fnGetData(singleRow).Teams; var teams = table.dataTable().fnGetData(singleRow).Teams;
var rolesText = $(roles).text();//roles is an HTML element, not a jquery one var rolesText = $(roles).text();//roles is an HTML element, not a jquery one
var teamsText = $(teams).text(); var teamsText = $(teams).text();
if(rolesText !== "-"){//"-" means no role if (rolesText !== "-") {//"-" means no role
var rolesArray = rolesText.split(","); var rolesArray = rolesText.split(",");
$('textarea#roleList').textext()[0].tags().addTags(rolesArray); $('textarea#roleList').textext()[0].tags().addTags(rolesArray);
} }
if(teamsText !== "-"){//"-" means no team if (teamsText !== "-") {//"-" means no team
var teamsArray = teamsText.split(","); var teamsArray = teamsText.split(",");
$('textarea#teamsList').textext()[0].tags().addTags(teamsArray); $('textarea#teamsList').textext()[0].tags().addTags(teamsArray);
} }
@ -765,7 +765,7 @@ function tableEvents() {
var teams = table.dataTable().fnGetData(singleRow).Teams; var teams = table.dataTable().fnGetData(singleRow).Teams;
var teamsText = $(teams).text(); var teamsText = $(teams).text();
var rolesText = $(roles).text();//roles is an HTML element, not a jquery one var rolesText = $(roles).text();//roles is an HTML element, not a jquery one
if(rolesText !== "-"){//"-" means no role if (rolesText !== "-") {//"-" means no role
var rolesArray = rolesText.split(","); var rolesArray = rolesText.split(",");
$('textarea#roleListInAssignRolesModal').textext()[0].tags().addTags(rolesArray); $('textarea#roleListInAssignRolesModal').textext()[0].tags().addTags(rolesArray);
} }
@ -779,7 +779,7 @@ function tableEvents() {
var teams = table.dataTable().fnGetData(singleRow).Teams; var teams = table.dataTable().fnGetData(singleRow).Teams;
var teamsText = $(teams).text(); var teamsText = $(teams).text();
var rolesText = $(roles).text();//roles is an HTML element, not a jquery one var rolesText = $(roles).text();//roles is an HTML element, not a jquery one
if(rolesText !== "-"){//"-" means no role if (rolesText !== "-") {//"-" means no role
var rolesArray = rolesText.split(","); var rolesArray = rolesText.split(",");
$('textarea#roleListInRemoveRolesModal').textext()[0].tags().addTags(rolesArray); $('textarea#roleListInRemoveRolesModal').textext()[0].tags().addTags(rolesArray);
} }
@ -814,7 +814,7 @@ function tableEvents() {
var teams = table.dataTable().fnGetData(singleRow).Teams; var teams = table.dataTable().fnGetData(singleRow).Teams;
var rolesText = $(roles).text();//roles is an HTML element, not a jquery one var rolesText = $(roles).text();//roles is an HTML element, not a jquery one
var teamsText = $(teams).text(); var teamsText = $(teams).text();
if(teamsText !== "-"){//"-" means no team if (teamsText !== "-") {//"-" means no team
var teamsArray = teamsText.split(","); var teamsArray = teamsText.split(",");
$('textarea#teamsListInAssignUsersToGroupsModal').textext()[0].tags().addTags(teamsArray); $('textarea#teamsListInAssignUsersToGroupsModal').textext()[0].tags().addTags(teamsArray);
} }
@ -828,7 +828,7 @@ function tableEvents() {
usersRequestsModalIsOpen = true; usersRequestsModalIsOpen = true;
}); });
$('#usersRequestsModal').on('shown', function () { $('#usersRequestsModal').on('shown', function() {
$('.denyClass').addClass('hidden'); $('.denyClass').addClass('hidden');
$('.grantDenyClass').removeClass('hidden'); $('.grantDenyClass').removeClass('hidden');
@ -845,7 +845,7 @@ function tableEvents() {
usersRequestsModalIsOpen = true; usersRequestsModalIsOpen = true;
}); });
$('#usersRequestsModal').on('shown', function () { $('#usersRequestsModal').on('shown', function() {
$('table#usersRequestsTable').DataTable().columns.adjust().draw(); $('table#usersRequestsTable').DataTable().columns.adjust().draw();
$('table#usersRequestsTable').DataTable().columns.adjust().responsive.recalc(); $('table#usersRequestsTable').DataTable().columns.adjust().responsive.recalc();
removeArrowFromFirstTableColumn(); removeArrowFromFirstTableColumn();
@ -860,14 +860,14 @@ function tableEvents() {
// ajaxCallUsersRequests(reqIds, refreshMode, organizationId); // ajaxCallUsersRequests(reqIds, refreshMode, organizationId);
$('table#usersRequestsTable').DataTable().clear(); $('table#usersRequestsTable').DataTable().clear();
fetchAllUsersRequests(refreshMode, []); fetchAllUsersRequests(refreshMode, []);
// $('div#usersRequestsTableToolbarContainer').addClass( // $('div#usersRequestsTableToolbarContainer').addClass(
// 'hiddenToolbar').removeClass('shownToolbar'); // 'hiddenToolbar').removeClass('shownToolbar');
$('div#usersRequestsTableToolbarContainer').animate({height: 'hide'}); $('div#usersRequestsTableToolbarContainer').animate({ height: 'hide' });
$('#usersRequestsTable th.none').removeClass('none'); $('#usersRequestsTable th.none').removeClass('none');
// startPreloader(); // startPreloader();
}); });
$('#acceptUsersRequestsModal, #rejectUsersRequestsModal').on('hidden', function(){ $('#acceptUsersRequestsModal, #rejectUsersRequestsModal').on('hidden', function() {
$('#usersRequestsModal').modal('show'); $('#usersRequestsModal').modal('show');
}); });
@ -910,8 +910,8 @@ function tableEvents() {
$('#emailForRejection').html(automaticRejectionEmailTemplate.html()); $('#emailForRejection').html(automaticRejectionEmailTemplate.html());
}); });
$('#userDetailsModal').on('hidden',function(){ $('#userDetailsModal').on('hidden', function() {
if(usersRequestsDetailModaWasOpen){ if (usersRequestsDetailModaWasOpen) {
$('#usersRequestsModal').modal('show'); $('#usersRequestsModal').modal('show');
} }
}); });
@ -933,7 +933,7 @@ function tableEvents() {
$('table#usersRequestsTable').DataTable().clear(); $('table#usersRequestsTable').DataTable().clear();
fetchAllUsersRequests(mode, reqIds, managerId, false); fetchAllUsersRequests(mode, reqIds, managerId, false);
$('div#usersRequestsTableToolbarContainer').animate({height:'hide'}); $('div#usersRequestsTableToolbarContainer').animate({ height: 'hide' });
$('table#usersRequestsTable thead th:first-of-type').removeClass('none'); $('table#usersRequestsTable thead th:first-of-type').removeClass('none');
$('#acceptUsersRequestsModal').modal('hide'); $('#acceptUsersRequestsModal').modal('hide');
@ -951,7 +951,7 @@ function tableEvents() {
var organizationId = $('#organizationId').text(); var organizationId = $('#organizationId').text();
$('div#usersRequestsModal').modal('hide'); $('div#usersRequestsModal').modal('hide');
$('textarea#tagsForEmails').parent().find('.text-tag').remove(); $('textarea#tagsForEmails').parent().find('.text-tag').remove();
if (reqIds.length === 0){ if (reqIds.length === 0) {
$('#rejectUsersRequestsModal').modal('hide'); $('#rejectUsersRequestsModal').modal('hide');
return; return;
} }
@ -959,9 +959,9 @@ function tableEvents() {
$('table#usersRequestsTable').DataTable().clear(); $('table#usersRequestsTable').DataTable().clear();
fetchAllUsersRequests(mode, reqIds, managerId, fetchAllUsersRequests(mode, reqIds, managerId,
false,""); false, "");
$('div#usersRequestsTableToolbarContainer').animate({height:'hide'}); $('div#usersRequestsTableToolbarContainer').animate({ height: 'hide' });
$('table#usersRequestsTable thead th:first-of-type').removeClass('none'); $('table#usersRequestsTable thead th:first-of-type').removeClass('none');
$('#rejectUsersRequestsModal').modal('hide'); $('#rejectUsersRequestsModal').modal('hide');
@ -973,80 +973,80 @@ function tableEvents() {
'click', 'click',
'div.usersRequestsTableToolbarContainer.shownToolbar div#rejectSeleced', 'div.usersRequestsTableToolbarContainer.shownToolbar div#rejectSeleced',
function() { function() {
// $('.grantDenyClass').addClass('hidden'); // $('.grantDenyClass').addClass('hidden');
// $('.denyClass').removeClass('hidden'); // $('.denyClass').removeClass('hidden');
// $('#emailForRejection').html(automaticRejectionEmailTemplate.html()); // $('#emailForRejection').html(automaticRejectionEmailTemplate.html());
// $('#emailForRejection').html( // $('#emailForRejection').html(
// $('#emailForRejection').html() // $('#emailForRejection').html()
// .replace('%site%', $('#groupName').text()) // .replace('%site%', $('#groupName').text())
// .replace('%portalName%', portalName) // .replace('%portalName%', portalName)
// .replace('%adminName%', $('#adminName').text()) // .replace('%adminName%', $('#adminName').text())
// ); // );
// $('#editEmailTemplate').tooltip(); // $('#editEmailTemplate').tooltip();
// //
// // allButtons hide // // allButtons hide
// $('#closeUsersRolesModal').data('btnData', 1); // $('#closeUsersRolesModal').data('btnData', 1);
// if (!$('div#emailForAcceptance').parent().hasClass( // if (!$('div#emailForAcceptance').parent().hasClass(
// 'hideSection')) // 'hideSection'))
// $('div#emailForAcceptance').parent().addClass( // $('div#emailForAcceptance').parent().addClass(
// 'hideSection'); // 'hideSection');
// $('div#emailForRejection').parent().removeClass( // $('div#emailForRejection').parent().removeClass(
// 'hideSection'); // 'hideSection');
// var width = $('div#usersRequestsModal div.modal-body') // var width = $('div#usersRequestsModal div.modal-body')
// .width(); // .width();
// width = '' + width + 'px'; // width = '' + width + 'px';
// $('div#usersRequestsTableContainer').animate( // $('div#usersRequestsTableContainer').animate(
// { // {
// right : width // right : width
// }, // },
// '2500', // '2500',
// function() { // function() {
// $('div#usersRequestsTableContainer') // $('div#usersRequestsTableContainer')
// .toggleClass('hideSection'); // .toggleClass('hideSection');
// $('div#requestsAcceptanceContainer') // $('div#requestsAcceptanceContainer')
// .toggleClass('hideSection').css({ // .toggleClass('hideSection').css({
// left : '0px' // left : '0px'
// }); // });
// }); // });
// $('#userRequestsHeader').contents().first()[0].textContent = 'Requests rejection'; // $('#userRequestsHeader').contents().first()[0].textContent = 'Requests rejection';
// $('button#sendRejection').toggleClass('hideButton'); // $('button#sendRejection').toggleClass('hideButton');
// $('button#acceptAll').toggleClass('hideButton'); // $('button#acceptAll').toggleClass('hideButton');
// $('button#rejectAll').toggleClass('hideButton'); // $('button#rejectAll').toggleClass('hideButton');
// //
// var usersEmails = []; // var usersEmails = [];
// usersRequestsMembershipRequestsIdsForEditing = []; // usersRequestsMembershipRequestsIdsForEditing = [];
// // tagsForEmails // // tagsForEmails
// for (var i = 0; i < usersRequestsDataForEditing.length; i++) { // for (var i = 0; i < usersRequestsDataForEditing.length; i++) {
// var email = usersRequestsDataForEditing[i][0].Email; // var email = usersRequestsDataForEditing[i][0].Email;
// usersEmails.push(email.substring(5, // usersEmails.push(email.substring(5,
// email.length - 6)); // email.length - 6));
// var reqId = usersRequestsDataForEditing[i][0].RequestId; // var reqId = usersRequestsDataForEditing[i][0].RequestId;
// usersRequestsMembershipRequestsIdsForEditing // usersRequestsMembershipRequestsIdsForEditing
// .push(reqId); // .push(reqId);
// } // }
// //
// var tags = $('textarea#tagsForEmails').parent().find( // var tags = $('textarea#tagsForEmails').parent().find(
// 'div.text-tags div.text-tag'); // 'div.text-tags div.text-tag');
// if (tags.length > 0) // if (tags.length > 0)
// tags.remove(); // tags.remove();
// //
// $('textarea#tagsForEmails').textext()[0].tags().addTags(usersEmails); // $('textarea#tagsForEmails').textext()[0].tags().addTags(usersEmails);
// for (var j = 0; j < usersRequestsMembershipRequestsIdsForEditing.length; j++) { // for (var j = 0; j < usersRequestsMembershipRequestsIdsForEditing.length; j++) {
// var theReqId = usersRequestsMembershipRequestsIdsForEditing[j] // var theReqId = usersRequestsMembershipRequestsIdsForEditing[j]
// .toString(); // .toString();
// $($('#tagsForEmails').parent().find('.text-tag')[j]) // $($('#tagsForEmails').parent().find('.text-tag')[j])
// .data( // .data(
// 'reqId', // 'reqId',
// theReqId.substring(5, // theReqId.substring(5,
// theReqId.length - 6)); // theReqId.length - 6));
// } // }
// //
// $('textarea#tagsForEmails').parent().find( // $('textarea#tagsForEmails').parent().find(
// 'a.tag-remove').off().on('click', function() { // 'a.tag-remove').off().on('click', function() {
// $(this).closest('.text-tag').remove(); // $(this).closest('.text-tag').remove();
// }); // });
// //
// $('#reloadUsersRequestsTable').addClass('hide'); // $('#reloadUsersRequestsTable').addClass('hide');
@ -1054,7 +1054,7 @@ function tableEvents() {
// var mode = deleteMode; // var mode = deleteMode;
var reqIds = []; var reqIds = [];
for (var i = 0; i < usersRequestsDataForEditing.length; i++) { for (var i = 0; i < usersRequestsDataForEditing.length; i++) {
var reqId = usersRequestsDataForEditing[i][0].RequestId; var reqId = usersRequestsDataForEditing[i][0].RequestId;
@ -1062,8 +1062,8 @@ function tableEvents() {
} }
// startPreloader(); // startPreloader();
// fetchAllUsersRequests(mode, reqIds, managerId, // fetchAllUsersRequests(mode, reqIds, managerId,
// false,""); // false,"");
$('#rejectUsersRequestsOk').data('reqIDs', $('#rejectUsersRequestsOk').data('reqIDs',
reqIds); reqIds);
@ -1115,18 +1115,18 @@ function tableEvents() {
teams.push($(this).text().trim()); teams.push($(this).text().trim());
}); });
// if (!deletePreviousRoles && (roles.length === 0 || teams.length)){ // if (!deletePreviousRoles && (roles.length === 0 || teams.length)){
// //
// return; // return;
// } // }
var deletePreviousRoles2 = true;//If you remove a role, the roles should be updated even though the checkbox might be unchecked var deletePreviousRoles2 = true;//If you remove a role, the roles should be updated even though the checkbox might be unchecked
fetchAllCurrentUsers(mode, deleteUsers, ajaxData, roles, teams, deletePreviousRoles2, [], false, MASS_EDIT_USERS); fetchAllCurrentUsers(mode, deleteUsers, ajaxData, roles, teams, deletePreviousRoles2, [], false, MASS_EDIT_USERS);
$('table#CurrentUsersTable tr.selected').removeClass('selected'); $('table#CurrentUsersTable tr.selected').removeClass('selected');
$('#changeUsersRolesModal').modal('hide'); $('#changeUsersRolesModal').modal('hide');
// $('div#toolbar').addClass('hiddenToolbar').removeClass('shownToolbar'); // $('div#toolbar').addClass('hiddenToolbar').removeClass('shownToolbar');
$('div#toolbar').removeClass('openToolbar'); $('div#toolbar').removeClass('openToolbar');
$('div#toolbar').animate({height:'hide'}); $('div#toolbar').animate({ height: 'hide' });
$('#CurrentUsersTable th:first').removeClass('none'); $('#CurrentUsersTable th:first').removeClass('none');
$('span#numOfSelLectedRows').text(''); $('span#numOfSelLectedRows').text('');
} }
@ -1160,12 +1160,50 @@ function tableEvents() {
$('table#CurrentUsersTable tr.selected').removeClass('selected'); $('table#CurrentUsersTable tr.selected').removeClass('selected');
$('#assignUsersRolesModal').modal('hide'); $('#assignUsersRolesModal').modal('hide');
$('#removeUsersRolesModal').modal('hide'); $('#removeUsersRolesModal').modal('hide');
// $('div#toolbar').addClass('hiddenToolbar').removeClass('shownToolbar'); // $('div#toolbar').addClass('hiddenToolbar').removeClass('shownToolbar');
$('span#numOfSelLectedRows').text(''); $('span#numOfSelLectedRows').text('');
$('#CurrentUsersTable th:first').removeClass('none'); $('#CurrentUsersTable th:first').removeClass('none');
// $('div#toolbar').addClass('hiddenToolbar').removeClass('shownToolbar'); // $('div#toolbar').addClass('hiddenToolbar').removeClass('shownToolbar');
$('div#toolbar').removeClass('openToolbar'); $('div#toolbar').removeClass('openToolbar');
$('div#toolbar').animate({height:'hide'}); $('div#toolbar').animate({ height: 'hide' });
$('#CurrentUsersTable th:first').removeClass('none');
}
);
$('button#saveUsersRolesModalInRemoveRolesModal').off().on(
'click',
function() {
var groupId = theGroupId;
var trueFalse = true;
var mode = acceptMode;
var deleteUsers = false;
var ajaxData = [];
for (var i = 0; i < $($('#userNamesListInRemoveRolesModal').parent().find(
'.text-tag')).length; i++) {
ajaxData.push($(
$('#userNamesListInRemoveRolesModal').parent().find('.text-tag')[i])
.data('userUUID'));
}
var roles = [];
$('#roleListInRemoveRolesModal').parent().find('div.text-tag span.text-label')
.each(function() {
roles.push($(this).text());
});
var teams = [];
var deletePreviousRoles2 = true;//If you remove a role, the roles should be updated even though the checkbox might be unchecked
fetchAllCurrentUsers(mode, deleteUsers, ajaxData, roles, teams, deletePreviousRoles2, [], false, REMOVE_ROLES_TO_USERS);
$('table#CurrentUsersTable tr.selected').removeClass('selected');
$('#assignUsersRolesModal').modal('hide');
$('#removeUsersRolesModal').modal('hide');
// $('div#toolbar').addClass('hiddenToolbar').removeClass('shownToolbar');
$('span#numOfSelLectedRows').text('');
$('#CurrentUsersTable th:first').removeClass('none');
// $('div#toolbar').addClass('hiddenToolbar').removeClass('shownToolbar');
$('div#toolbar').removeClass('openToolbar');
$('div#toolbar').animate({ height: 'hide' });
$('#CurrentUsersTable th:first').removeClass('none'); $('#CurrentUsersTable th:first').removeClass('none');
} }
); );
@ -1196,10 +1234,10 @@ function tableEvents() {
fetchAllCurrentUsers(mode, deleteUsers, ajaxData, roles, teams, deletePreviousRoles2, [], false, ASSIGN_TEAMS_TO_USERS); fetchAllCurrentUsers(mode, deleteUsers, ajaxData, roles, teams, deletePreviousRoles2, [], false, ASSIGN_TEAMS_TO_USERS);
$('table#CurrentUsersTable tr.selected').removeClass('selected'); $('table#CurrentUsersTable tr.selected').removeClass('selected');
$('#assignUsersToGroupsModal').modal('hide'); $('#assignUsersToGroupsModal').modal('hide');
// $('div#toolbar').addClass('hiddenToolbar').removeClass('shownToolbar'); // $('div#toolbar').addClass('hiddenToolbar').removeClass('shownToolbar');
$('span#numOfSelLectedRows').text(''); $('span#numOfSelLectedRows').text('');
$('div#toolbar').removeClass('openToolbar'); $('div#toolbar').removeClass('openToolbar');
$('div#toolbar').animate({height:'hide'}); $('div#toolbar').animate({ height: 'hide' });
$('#CurrentUsersTable th:first').removeClass('none'); $('#CurrentUsersTable th:first').removeClass('none');
} }
); );
@ -1243,8 +1281,8 @@ function tableEvents() {
customMailForMembershipRequestRejectionBody = $('#userEditedMailTemplate').val(); customMailForMembershipRequestRejectionBody = $('#userEditedMailTemplate').val();
if(customMailForMembershipRequestRejectionBody !== undefined){ if (customMailForMembershipRequestRejectionBody !== undefined) {
customMailForMembershipRequestRejectionBody = customMailForMembershipRequestRejectionBody.replace(/\n/g,"<br>"); customMailForMembershipRequestRejectionBody = customMailForMembershipRequestRejectionBody.replace(/\n/g, "<br>");
} }
// startPreloader(); // startPreloader();
@ -1254,7 +1292,7 @@ function tableEvents() {
// ajaxCallUsersRequests(reqIds, deleteMode, // ajaxCallUsersRequests(reqIds, deleteMode,
// organizationId); // organizationId);
// fetchAllRejectedUsersRequests(); // fetchAllRejectedUsersRequests();
}); });
$('#userRequestsNotifications #notificationsNumberPlaceHolder, #userRequestsNotificationsTabletView #notificationsNumberPlaceHolderTabletView').off('DOMNodeInserted').bind( $('#userRequestsNotifications #notificationsNumberPlaceHolder, #userRequestsNotificationsTabletView #notificationsNumberPlaceHolderTabletView').off('DOMNodeInserted').bind(
@ -1264,16 +1302,16 @@ function tableEvents() {
if ($(this).text() === '0' || $(this).text() === '') { if ($(this).text() === '0' || $(this).text() === '') {
$(this).parent().removeClass('notificationsShown').addClass( $(this).parent().removeClass('notificationsShown').addClass(
'notificationsHidden'); 'notificationsHidden');
if($(this).text() === '0'){ if ($(this).text() === '0') {
return; return;
}else{ } else {
$(this).text('0'); $(this).text('0');
} }
// $('#usersManagementDiv').text('No Pending Requests'); // $('#usersManagementDiv').text('No Pending Requests');
} else { } else {
$(this).parent().removeClass('notificationsHidden').addClass( $(this).parent().removeClass('notificationsHidden').addClass(
'notificationsShown'); 'notificationsShown');
// $('#usersManagementDiv').text('Pending Requests:'); // $('#usersManagementDiv').text('Pending Requests:');
} }
}); });
@ -1307,29 +1345,29 @@ function tableEvents() {
$('button#rejectAll').off().on( $('button#rejectAll').off().on(
'click', 'click',
function() { function() {
// var mode = deleteMode; // var mode = deleteMode;
// var managerId = $('#userID').text(); // var managerId = $('#userID').text();
// var existingTrs = $('table#usersRequestsTable tbody tr'); // var existingTrs = $('table#usersRequestsTable tbody tr');
// var reqIDs = []; // var reqIDs = [];
// for (var i = 0; i < existingTrs.length; i++) { // for (var i = 0; i < existingTrs.length; i++) {
// var data = $($('table#usersRequestsTable').dataTable() // var data = $($('table#usersRequestsTable').dataTable()
// .fnGetData(existingTrs[i])); // .fnGetData(existingTrs[i]));
// var reqID = data[0].RequestId; // var reqID = data[0].RequestId;
// reqIDs.push(reqID.substring(5, reqID.length - 6)); // reqIDs.push(reqID.substring(5, reqID.length - 6));
// } // }
// fetchAllUsersRequests(mode, reqIDs, managerId, false, ""); // fetchAllUsersRequests(mode, reqIDs, managerId, false, "");
// $('div#usersRequestsModal').modal('hide'); // $('div#usersRequestsModal').modal('hide');
if($('#usersRequestsTable th:first').hasClass('none')){ if ($('#usersRequestsTable th:first').hasClass('none')) {
var trs = $('#usersRequestsTable tbody tr'); var trs = $('#usersRequestsTable tbody tr');
$.each(trs, function(){ $.each(trs, function() {
$(this).find('td:first-of-type').click(); $(this).find('td:first-of-type').click();
}); });
$.each(trs, function(){ $.each(trs, function() {
$(this).find('td:first-of-type').click(); $(this).find('td:first-of-type').click();
}); });
}else { } else {
var trs = $('#usersRequestsTable tbody tr:not(.selected)'); var trs = $('#usersRequestsTable tbody tr:not(.selected)');
$.each(trs, function(){ $.each(trs, function() {
$(this).find('td:first-of-type').click(); $(this).find('td:first-of-type').click();
}); });
} }
@ -1348,9 +1386,9 @@ function tableEvents() {
fetchAllCurrentUsers(2, false, [], [], false, [], false); fetchAllCurrentUsers(2, false, [], [], false, [], false);
// ajaxCallCurrentUsers(groupId, doRefresh, mode, selectedUsers, // ajaxCallCurrentUsers(groupId, doRefresh, mode, selectedUsers,
// roles, false); // roles, false);
// if ($('div#toolbar').hasClass('shownToolbar')) // if ($('div#toolbar').hasClass('shownToolbar'))
// $('div#toolbar').addClass('hiddenToolbar').removeClass( // $('div#toolbar').addClass('hiddenToolbar').removeClass(
// 'shownToolbar'); // 'shownToolbar');
}); });
$(document).on('click', 'button#editEmailTemplate', function() { $(document).on('click', 'button#editEmailTemplate', function() {
@ -1358,13 +1396,13 @@ function tableEvents() {
automaticTemplate.find('div.tooltip.fade.top.in').remove(); automaticTemplate.find('div.tooltip.fade.top.in').remove();
var text = automaticTemplate.text(); var text = automaticTemplate.text();
var div = $('<div></div>', { var div = $('<div></div>', {
'class' : 'span11' 'class': 'span11'
}); });
var textarea = $('<textarea></textarea>', { var textarea = $('<textarea></textarea>', {
id : 'userEditedMailTemplate', id: 'userEditedMailTemplate',
text : text.trim(), text: text.trim(),
'class' : 'span12', 'class': 'span12',
rows : 7 rows: 7
}); });
div.append(textarea); div.append(textarea);
automaticTemplate.replaceWith(div); automaticTemplate.replaceWith(div);
@ -1374,9 +1412,9 @@ function tableEvents() {
sendCustomMailForMembershipRequestRejection = true; sendCustomMailForMembershipRequestRejection = true;
}); });
$('#openEditModal').off('click').on('click', function(){ $('#openEditModal').off('click').on('click', function() {
$('#userDetailsModal').modal('hide'); $('#userDetailsModal').modal('hide');
if(keepTrackOfUsersTableRow !== -1){ if (keepTrackOfUsersTableRow !== -1) {
var htmlRow = $('#CurrentUsersTable tbody tr')[keepTrackOfUsersTableRow]; var htmlRow = $('#CurrentUsersTable tbody tr')[keepTrackOfUsersTableRow];
var $Row = $(htmlRow); var $Row = $(htmlRow);
$Row.find('td:first').trigger('click'); $Row.find('td:first').trigger('click');

3
src/main/webapp/views/usersManagement.jsp
View File

@ -78,6 +78,7 @@
var MASS_EDIT_USERS = 0; var MASS_EDIT_USERS = 0;
var ASSIGN_ROLES_TO_USERS = 1; var ASSIGN_ROLES_TO_USERS = 1;
var ASSIGN_TEAMS_TO_USERS = 2; var ASSIGN_TEAMS_TO_USERS = 2;
var REMOVE_ROLES_TO_USERS = 3;
var handlersAppliedToToolbarForFirstTime = false; var handlersAppliedToToolbarForFirstTime = false;
</script> </script>
@ -501,10 +502,8 @@
</div> </div>
</div> </div>
<div class="modal-body"> <div class="modal-body">
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button id="openEditModal" class="btn btn-link btn-large">Edit</button>
<button id="closeUSerDetailsModal" class="btn btn-link btn-large" data-dismiss="modal" aria-hidden="true">Close</button> <button id="closeUSerDetailsModal" class="btn btn-link btn-large" data-dismiss="modal" aria-hidden="true">Close</button>
</div> </div>
</div> </div>