Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
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
die_coolen_jungs
our_own_cloud_project
Commits
1d1ab2a9
Commit
1d1ab2a9
authored
12 years ago
by
Georg Ehrke
Browse files
Options
Downloads
Patches
Plain Diff
Revert "fix group and subadmin managing for 'ajax-loaded' users"
This reverts commit
a5774229
.
parent
4c83a4c9
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
settings/js/users.js
+7
-2
7 additions, 2 deletions
settings/js/users.js
with
7 additions
and
2 deletions
settings/js/users.js
+
7
−
2
View file @
1d1ab2a9
...
...
@@ -71,10 +71,15 @@ var UserList={
var
tr
=
$
(
'
tbody tr
'
).
first
().
clone
();
tr
.
attr
(
'
data-uid
'
,
username
);
tr
.
find
(
'
td.name
'
).
text
(
username
);
var
groupsSelect
=
$
(
'
<select multiple="multiple" class="groupsselect" data-placehoder="Groups" data-username="
'
+
username
+
'
" data-user-groups="
'
+
groups
+
'
" title="Groups">
'
);
var
groupsSelect
=
$
(
'
<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="Groups">
'
);
groupsSelect
.
data
(
'
username
'
,
username
);
groupsSelect
.
data
(
'
userGroups
'
,
groups
);
tr
.
find
(
'
td.groups
'
).
empty
();
if
(
tr
.
find
(
'
td.subadmins
'
).
length
>
0
)
{
var
subadminSelect
=
$
(
'
<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" data-username="
'
+
username
+
'
" data-user-groups="
'
+
groups
+
'
" data-subadmin="
'
+
subadmin
+
'
" title="
'
+
t
(
'
files
'
,
'
Group Admin
'
)
+
'
">
'
);
var
subadminSelect
=
$
(
'
<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="
'
+
t
(
'
files
'
,
'
Group Admin
'
)
+
'
">
'
);
subadminSelect
.
data
(
'
username
'
,
username
);
subadminSelect
.
data
(
'
userGroups
'
,
groups
);
subadminSelect
.
data
(
'
subadmin
'
,
subadmin
);
tr
.
find
(
'
td.subadmins
'
).
empty
();
}
var
allGroups
=
String
(
$
(
'
#content table
'
).
attr
(
'
data-groups
'
)).
split
(
'
,
'
);
...
...
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