Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
re2o
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nounous
re2o
Commits
6af40d9e
Commit
6af40d9e
authored
Oct 31, 2016
by
chirac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix le prb de destruction de droits
parent
02e03073
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
5 deletions
+39
-5
users/admin.py
users/admin.py
+1
-1
users/migrations/0038_auto_20161031_0258.py
users/migrations/0038_auto_20161031_0258.py
+29
-0
users/views.py
users/views.py
+9
-4
No files found.
users/admin.py
View file @
6af40d9e
...
...
@@ -44,7 +44,7 @@ class ListRightAdmin(VersionAdmin):
class
ListShellAdmin
(
VersionAdmin
):
list_display
=
(
'shell'
,)
class
RightAdmin
(
admin
.
Model
Admin
):
class
RightAdmin
(
Version
Admin
):
list_display
=
(
'user'
,
'right'
)
class
RequestAdmin
(
admin
.
ModelAdmin
):
...
...
users/migrations/0038_auto_20161031_0258.py
0 → 100644
View file @
6af40d9e
# -*- coding: utf-8 -*-
from
__future__
import
unicode_literals
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'users'
,
'0037_auto_20161028_1906'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'ldapserviceuser'
,
name
=
'dn'
,
field
=
models
.
CharField
(
max_length
=
200
),
),
migrations
.
AlterField
(
model_name
=
'ldapuser'
,
name
=
'dn'
,
field
=
models
.
CharField
(
max_length
=
200
),
),
migrations
.
AlterField
(
model_name
=
'ldapusergroup'
,
name
=
'dn'
,
field
=
models
.
CharField
(
max_length
=
200
),
),
]
users/views.py
View file @
6af40d9e
...
...
@@ -173,7 +173,10 @@ def add_right(request, userid):
right
=
right
.
save
(
commit
=
False
)
right
.
user
=
user
try
:
right
.
save
()
with
transaction
.
atomic
(),
reversion
.
create_revision
():
reversion
.
set_user
(
request
.
user
)
reversion
.
set_comment
(
"Ajout du droit %s"
%
right
.
right
)
right
.
save
()
messages
.
success
(
request
,
"Droit ajouté"
)
except
IntegrityError
:
pass
...
...
@@ -184,13 +187,15 @@ def add_right(request, userid):
@
permission_required
(
'bureau'
)
def
del_right
(
request
):
user_right_list
=
DelRightForm
(
request
.
POST
or
None
)
right_list
=
ListRight
.
objects
.
all
()
if
user_right_list
.
is_valid
():
right_del
=
user_right_list
.
cleaned_data
[
'rights'
]
right_del
.
delete
()
with
transaction
.
atomic
(),
reversion
.
create_revision
():
reversion
.
set_user
(
request
.
user
)
reversion
.
set_comment
(
"Retrait des droit %s"
%
','
.
join
(
str
(
deleted_right
)
for
deleted_right
in
right_del
))
right_del
.
delete
()
messages
.
success
(
request
,
"Droit retiré avec succès"
)
return
redirect
(
"/users/"
)
return
form
({
'user
_right_list'
:
user_right_list
,
'right_list'
:
right_list
},
'users/index_rights
.html'
,
request
)
return
form
({
'user
form'
:
user_right_list
},
'users/user
.html'
,
request
)
@
login_required
@
permission_required
(
'bofh'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment