Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
uffd
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Luca (strifel)
uffd
Commits
e8d89354
Verified
Commit
e8d89354
authored
4 years ago
by
nd
Browse files
Options
Downloads
Patches
Plain Diff
add support to edit roles and recalculate members groups
parent
8e73775e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
uffd/role/models.py
+5
-0
5 additions, 0 deletions
uffd/role/models.py
uffd/role/views.py
+8
-4
8 additions, 4 deletions
uffd/role/views.py
with
13 additions
and
4 deletions
uffd/role/models.py
+
5
−
0
View file @
e8d89354
...
@@ -23,6 +23,11 @@ class Role(db.Model):
...
@@ -23,6 +23,11 @@ class Role(db.Model):
def
get_for_user
(
cls
,
user
):
def
get_for_user
(
cls
,
user
):
return
Role
.
query
.
join
(
Role
.
members
,
aliased
=
True
).
filter_by
(
dn
=
user
.
dn
)
return
Role
.
query
.
join
(
Role
.
members
,
aliased
=
True
).
filter_by
(
dn
=
user
.
dn
)
def
member_ldap
(
self
):
result
=
[]
for
dn
in
self
.
member_dns
():
result
.
append
(
User
.
from_ldap_dn
(
dn
))
return
result
def
member_dns
(
self
):
def
member_dns
(
self
):
return
list
(
map
(
attrgetter
(
'
dn
'
),
self
.
members
))
return
list
(
map
(
attrgetter
(
'
dn
'
),
self
.
members
))
def
add_member
(
self
,
member
):
def
add_member
(
self
,
member
):
...
...
This diff is collapsed.
Click to expand it.
uffd/role/views.py
+
8
−
4
View file @
e8d89354
...
@@ -57,10 +57,14 @@ def update(roleid=False):
...
@@ -57,10 +57,14 @@ def update(roleid=False):
elif
group
.
dn
in
role_group_dns
:
elif
group
.
dn
in
role_group_dns
:
role
.
del_group
(
group
)
role
.
del_group
(
group
)
# usergroups = set()
members
=
role
.
member_ldap
()
# for role in Role.get_for_user(user).all():
for
user
in
members
:
# usergroups.update(role.group_dns())
usergroups
=
set
()
# user.replace_group_dns(usergroups)
for
role
in
Role
.
get_for_user
(
user
).
all
():
usergroups
.
update
(
role
.
group_dns
())
user
.
replace_group_dns
(
usergroups
)
if
not
user
.
to_ldap
():
flash
(
'
updating group membership for user {} failed
'
.
format
(
user
.
loginname
))
session
.
commit
()
session
.
commit
()
return
redirect
(
url_for
(
'
role.index
'
))
return
redirect
(
url_for
(
'
role.index
'
))
...
...
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