Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-jams
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-jams
Commits
b9a626a9
Commit
b9a626a9
authored
4 years ago
by
William Enright
Browse files
Options
Downloads
Patches
Plain Diff
local only buttons no longer displayed for ldap/ad users
Change-Id: I9ea7ba78b5744cc4058646f82ef9f049831ee5f4
parent
5eccaea3
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
jams-server/src/main/resources/webapp/js/user.js
+19
-15
19 additions, 15 deletions
jams-server/src/main/resources/webapp/js/user.js
with
19 additions
and
15 deletions
jams-server/src/main/resources/webapp/js/user.js
+
19
−
15
View file @
b9a626a9
...
...
@@ -22,7 +22,7 @@ var deviceId = '';
var
searchData
=
{};
var
userData
=
{};
var
b64
;
var
hsqlconfig
=
false
;
var
local
=
false
;
var
username
=
''
;
$
(
document
).
ready
(
function
()
{
...
...
@@ -60,7 +60,7 @@ $(document).ready(function() {
//edit user
$
(
'
.user-information
'
).
on
(
'
click
'
,
'
.edit-user
'
,
function
()
{
var
userDataParams
=
new
URLSearchParams
(
u
se
r
Data
).
toString
();
var
userDataParams
=
new
URLSearchParams
(
se
arch
Data
).
toString
();
$
(
'
#form-user-update
'
)[
0
].
reset
();
// attempt auto-fill
ajaxApiCall
(
api_path_get_user_directory_search
,
'
GET
'
,
userDataParams
,
null
,
handleUserAutofill
);
...
...
@@ -144,7 +144,7 @@ $(document).ready(function() {
// set User information fields
setTimeout
(
function
()
{
ajaxApiCall
(
api_path_get_directories
,
'
GET
'
,
null
,
null
,
is
hsqlConfig
);
ajaxApiCall
(
api_path_get_directories
,
'
GET
'
,
null
,
null
,
is
LocalDB
);
ajaxApiCall
(
api_path_get_user_directory_search
,
'
GET
'
,
searchData
,
null
,
setUserInfoDataSource
);
ajaxApiCall
(
api_path_get_user_directory_search
,
'
GET
'
,
searchData
,
null
,
setUserExtendedData
);
},
300
);
...
...
@@ -185,7 +185,7 @@ function setUserInfoDataSource(data, statusCode, jqXHR) {
'
</i></h5>
'
;
if
(
getAdminStatus
())
{
if
(
hsqlconfig
)
if
(
local
)
userRow
+=
'
<div class="user-information__right"><button class="reset-password text-uppercase"><i class="fa fa-edit"></i>Reset Password</button><button class="edit-user text-uppercase"><i class="fa fa-edit"></i>Edit User</button><button class="btn-danger text-uppercase de-authorize-user">Revoke User</button></div>
'
;
else
userRow
+=
'
<div class="user-information__right"><button class="btn-danger text-uppercase de-authorize-user">Revoke User</button></div>
'
;
...
...
@@ -458,19 +458,23 @@ function handleUserAutofill(data, statusCode, jqXHR) {
}
}
function
ishsqlConfig
(
data
,
statusCode
,
jqXHR
){
var
isAd
=
false
;
var
isLdap
=
false
;
function
isLocalDB
(
data
,
statusCode
,
jqXHR
){
if
(
jqXHR
.
status
==
200
&&
data
.
length
!=
0
)
{
var
resultSet
=
data
;
for
(
i
=
0
;
i
<
resultSet
.
length
;
i
++
)
{
if
(
resultSet
[
i
]
===
"
net.jami.accountmanagementserver.activedirectoryconnector.ActiveDirectoryConnector
"
)
isAd
=
true
;
if
(
resultSet
[
i
]
===
"
net.jami.accountmanagementserver.ldapconnector.LDAPConnector
"
)
isLdap
=
true
;
local
=
false
;
var
firstFound
=
false
;
if
(
data
.
length
==
1
&&
data
[
0
].
type
===
"
LOCAL
"
&&
data
[
0
].
realm
===
"
LOCAL
"
)
{
local
=
true
;
}
for
(
i
=
0
;
i
<
data
.
length
;
i
++
)
{
if
(
firstFound
&&
data
[
i
].
type
===
"
LOCAL
"
&&
data
[
i
].
realm
===
"
LOCAL
"
)
{
local
=
true
;
break
;
}
if
(
!
firstFound
&&
data
[
i
].
type
===
"
LOCAL
"
&&
data
[
i
].
realm
===
"
LOCAL
"
)
firstFound
=
true
;
}
if
(
!
isAd
&&
!
isLdap
)
hsqlconfig
=
true
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment