Skip to content
Snippets Groups Projects
Commit e820cf72 authored by William Enright's avatar William Enright
Browse files

fixed UI buttons reserved for local configs appearing in user profile 

Change-Id: I8094f1ce43392219179c1c2c8ed93b1523329084
parent c4b9a98f
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
jams-server/src/main/resources/webapp/js/search.js
+ 7
− 8
View file @ e820cf72
...@@ -409,23 +409,22 @@ function revokeUser(data, statusCode, jqXHR) { ...@@ -409,23 +409,22 @@ function revokeUser(data, statusCode, jqXHR) {
} }
ajaxApiCall(api_path_get_user_directory_search, 'GET', {"queryString":"*"}, null, listAllUsers); ajaxApiCall(api_path_get_user_directory_search, 'GET', {"queryString":"*"}, null, listAllUsers);
ajaxApiCall(api_path_post_create_user_profile, 'GET', {"username":"*"}, null, listAllUsers);
userRevoke = ''; userRevoke = '';
} }
function handleUserAutofill(data, statusCode, jqXHR) { function handleUserAutofill(data, statusCode, jqXHR) {
if (jqXHR.status == 200) { if (jqXHR.status == 200) {
var resultSet = data[0]; var resultSet = data[0];
if (resultSet.jpegPhoto) if (resultSet.profilePicture)
b64 = resultSet.jpegPhoto; b64 = resultSet.profilePicture;
$('#input-givenName-update').val(resultSet.firstName); $('#input-givenName-update').val(resultSet.firstName);
$('#input-sn-update').val(resultSet.lastName); $('#input-sn-update').val(resultSet.lastName);
$('#input-mail-update').val(resultSet.mail); $('#input-mail-update').val(resultSet.email);
$('#input-o-update').val(resultSet.org); $('#input-o-update').val(resultSet.organization);
$('#input-facsimileTelephoneNumber-update').val(resultSet.faxNumber); $('#input-facsimileTelephoneNumber-update').val(resultSet.faxNumber);
$('#input-telephoneNumber-update').val(resultSet.telephoneNumber); $('#input-telephoneNumber-update').val(resultSet.phoneNumber);
$('#input-extension-update').val(resultSet.extension); $('#input-extension-update').val(resultSet.phoneNumberExtension);
$('#input-mobile-update').val(resultSet.mobilePhoneNumber); $('#input-mobile-update').val(resultSet.mobileNumber);
} }
} }
......
jams-server/src/main/resources/webapp/js/user.js
+ 57
− 40
View file @ e820cf72
...@@ -24,6 +24,7 @@ var userData = {}; ...@@ -24,6 +24,7 @@ var userData = {};
var b64; var b64;
var local = false; var local = false;
var username = ''; var username = '';
var userStatus = '';
$(document).ready(function() { $(document).ready(function() {
...@@ -39,6 +40,7 @@ $(document).ready(function() { ...@@ -39,6 +40,7 @@ $(document).ready(function() {
username = $.urlParam('username'); username = $.urlParam('username');
// check if we have a username parameter // check if we have a username parameter
if (username != '' && username != null) { if (username != '' && username != null) {
...@@ -50,6 +52,20 @@ $(document).ready(function() { ...@@ -50,6 +52,20 @@ $(document).ready(function() {
"username":username "username":username
}; };
ajaxApiCall(api_path_get_directories, 'GET', null, null, isLocalDB).then(function() {
setTimeout(function() {
ajaxApiCall(api_path_get_user, 'GET', userData, null, setStatus).then(function() {
ajaxApiCall(api_path_get_user_directory_search, 'GET', searchData, null, setUserInfoDataSource).then(function() {
setTimeout(function() {
ajaxApiCall(api_path_get_user_directory_search, 'GET', searchData, null, setUserExtendedData);
}, 300);
});
});
}, 300)
});
// set User devices information // set User devices information
ajaxApiCall(api_path_get_auth_devices, 'GET', userData, null, setUserDevices); ajaxApiCall(api_path_get_auth_devices, 'GET', userData, null, setUserDevices);
...@@ -71,18 +87,19 @@ $(document).ready(function() { ...@@ -71,18 +87,19 @@ $(document).ready(function() {
e.preventDefault(); e.preventDefault();
var data = { var data = {
'givenName': $('#input-givenName-update').val(), 'firstName': $('#input-givenName-update').val(),
'sn': $('#input-sn-update').val(), 'lastName': $('#input-sn-update').val(),
'CN': encodeURIComponent(userData["username"]), 'username': username,
'mail': $('#input-mail-update').val(), 'email': $('#input-mail-update').val(),
'jpegPhoto': b64, 'profilePicture': b64,
'o': $('#input-o-update').val(), 'organization': $('#input-o-update').val(),
'facsimileTelephoneNumber': $('#input-facsimileTelephoneNumber-update').val(), 'faxNumber': $('#input-facsimileTelephoneNumber-update').val(),
'telephoneNumber': $('#input-telephoneNumber-update').val(), 'phoneNumber': $('#input-telephoneNumber-update').val(),
'extension': $('#input-extension-update').val(), 'phoneNumberExtension': $('#input-extension-update').val(),
'mobile': $('#input-mobile-update').val() 'mobileNumber': $('#input-mobile-update').val()
} }
ajaxApiCall(api_path_post_update_user, 'POST', data, null, handleUserUpdate);
ajaxApiCall(api_path_put_update_user_profile, 'PUT', data, null, handleUserUpdate);
}); });
}); });
...@@ -98,7 +115,7 @@ $(document).ready(function() { ...@@ -98,7 +115,7 @@ $(document).ready(function() {
}); });
$( '.user-information' ).on( 'click', '.reset-password', function (e) { $( '.user-information' ).on( 'click', '.reset-password', function (e) {
ajaxApiCall(api_path_post_update_user, 'GET', userData, null, handleNewOTP); ajaxApiCall(api_path_get_user, 'GET', userData, null, handleNewOTP);
}); });
// change device name // change device name
...@@ -141,14 +158,6 @@ $(document).ready(function() { ...@@ -141,14 +158,6 @@ $(document).ready(function() {
$('#device-id-modal').text(''); $('#device-id-modal').text('');
}); });
// set User information fields
setTimeout(function() {
ajaxApiCall(api_path_get_directories, 'GET', null, null, isLocalDB);
ajaxApiCall(api_path_get_user_directory_search, 'GET', searchData, null, setUserInfoDataSource);
ajaxApiCall(api_path_get_user_directory_search, 'GET', searchData, null, setUserExtendedData);
}, 300);
} }
else { else {
$('.user-information-container').remove(); $('.user-information-container').remove();
...@@ -165,15 +174,13 @@ function setUserInfoDataSource(data, statusCode, jqXHR) { ...@@ -165,15 +174,13 @@ function setUserInfoDataSource(data, statusCode, jqXHR) {
if (resultSet.length > 0) { if (resultSet.length > 0) {
// build table row for User item // build table row for User item
for (i = 0; i < resultSet.length; i++) { for (i = 0; i < resultSet.length; i++) {
var status = '';
// determine User status // determine User status
if (resultSet[i].revoked) { if (userStatus == "Revoked") {
status = 'Revoked';
disabled = true; disabled = true;
status_class = 'text-danger'; status_class = 'text-danger';
} }
else { else {
status = 'Active';
status_class = ''; status_class = '';
} }
...@@ -181,7 +188,7 @@ function setUserInfoDataSource(data, statusCode, jqXHR) { ...@@ -181,7 +188,7 @@ function setUserInfoDataSource(data, statusCode, jqXHR) {
userRow += userRow +=
'<div class="row"><div class="col-md-4 col-sm-12"><div id="left_panel" class="user-information__left"><h5 class="user-detail"></h5></div></div><div id="rightcolumn" class="col-md-8 col-sm-12"></div></div>' + '<div class="row"><div class="col-md-4 col-sm-12"><div id="left_panel" class="user-information__left"><h5 class="user-detail"></h5></div></div><div id="rightcolumn" class="col-md-8 col-sm-12"></div></div>' +
'<h5 className="user-detail"><i id="status-whatever" class="'+ status_class +'">' + status + '<h5 className="user-detail"><i id="status-whatever" class="'+ status_class +'">' + userStatus +
'</i></h5>'; '</i></h5>';
if (getAdminStatus()) { if (getAdminStatus()) {
...@@ -212,6 +219,11 @@ function setUserExtendedData(data, statusCode, jqXHR) { ...@@ -212,6 +219,11 @@ function setUserExtendedData(data, statusCode, jqXHR) {
var resultSet = data; var resultSet = data;
var userRow = ''; var userRow = '';
var disabled = ''; var disabled = '';
if (getAdminStatus()) {
$('.mt-5')[0].style = 'display: flex';
}
if (resultSet.length > 0) { if (resultSet.length > 0) {
// build table row for User item // build table row for User item
for (i = 0; i < 1; i++) { for (i = 0; i < 1; i++) {
...@@ -292,10 +304,6 @@ function setUserExtendedData(data, statusCode, jqXHR) { ...@@ -292,10 +304,6 @@ function setUserExtendedData(data, statusCode, jqXHR) {
if (disabled) { if (disabled) {
$('.de-authorize-user').prop('disabled', true); $('.de-authorize-user').prop('disabled', true);
} }
if (getAdminStatus()) {
$('.mt-5')[0].show();
}
} }
} }
} }
...@@ -400,10 +408,12 @@ function handleUserUpdate(){ ...@@ -400,10 +408,12 @@ function handleUserUpdate(){
$('.user-information').empty(); $('.user-information').empty();
ajaxApiCall(api_path_get_user_directory_search, 'GET', searchData, null, setUserInfoDataSource).then(function() {
setTimeout(function() { setTimeout(function() {
ajaxApiCall(api_path_get_user_directory_search, 'GET', searchData, null, setUserInfoDataSource);
ajaxApiCall(api_path_get_user_directory_search, 'GET', searchData, null, setUserExtendedData); ajaxApiCall(api_path_get_user_directory_search, 'GET', searchData, null, setUserExtendedData);
}, 1000); }, 300);
});
} }
function handleFileSelect(evt) { function handleFileSelect(evt) {
...@@ -449,16 +459,16 @@ function handleUserAutofill(data, statusCode, jqXHR) { ...@@ -449,16 +459,16 @@ function handleUserAutofill(data, statusCode, jqXHR) {
if (jqXHR.status == 200) { if (jqXHR.status == 200) {
var resultSet = data[0]; var resultSet = data[0];
if (resultSet.jpegPhoto) if (resultSet.profilePicture)
b64 = resultSet.jpegPhoto; b64 = resultSet.profilePicture;
$('#input-givenName-update').val(resultSet.firstName); $('#input-givenName-update').val(resultSet.firstName);
$('#input-sn-update').val(resultSet.lastName); $('#input-sn-update').val(resultSet.lastName);
$('#input-mail-update').val(resultSet.mail); $('#input-mail-update').val(resultSet.email);
$('#input-o-update').val(resultSet.org); $('#input-o-update').val(resultSet.organization);
$('#input-facsimileTelephoneNumber-update').val(resultSet.faxNumber); $('#input-facsimileTelephoneNumber-update').val(resultSet.faxNumber);
$('#input-telephoneNumber-update').val(resultSet.telephoneNumber); $('#input-telephoneNumber-update').val(resultSet.phoneNumber);
$('#input-extension-update').val(resultSet.extension); $('#input-extension-update').val(resultSet.phoneNumberExtension);
$('#input-mobile-update').val(resultSet.mobilePhoneNumber); $('#input-mobile-update').val(resultSet.mobileNumber);
} }
} }
...@@ -497,6 +507,13 @@ function handleNewOTP(data) { ...@@ -497,6 +507,13 @@ function handleNewOTP(data) {
} }
} }
function setStatus(data) {
if (data.getResponseHeader('revoked') == 'true')
userStatus = "Revoked";
else
userStatus = "Active";
}
// clean error messages when button selected // clean error messages when button selected
$('button').click(function() { $('button').click(function() {
$('.configMessage').hide(); $('.configMessage').hide();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment