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
57f74f38
Commit
57f74f38
authored
Nov 21, 2017
by
Gabriel Detraz
Committed by
root
Nov 21, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fonction can_create sur un user
parent
772fdcaa
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
48 additions
and
9 deletions
+48
-9
preferences/migrations/0024_optionaluser_all_can_create.py
preferences/migrations/0024_optionaluser_all_can_create.py
+20
-0
preferences/models.py
preferences/models.py
+4
-0
preferences/templates/preferences/display_preferences.html
preferences/templates/preferences/display_preferences.html
+4
-0
users/models.py
users/models.py
+9
-2
users/templates/users/sidebar.html
users/templates/users/sidebar.html
+5
-6
users/views.py
users/views.py
+6
-1
No files found.
preferences/migrations/0024_optionaluser_all_can_create.py
0 → 100644
View file @
57f74f38
# -*- coding: utf-8 -*-
# Generated by Django 1.10.7 on 2017-11-21 04:42
from
__future__
import
unicode_literals
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'preferences'
,
'0023_auto_20171015_2033'
),
]
operations
=
[
migrations
.
AddField
(
model_name
=
'optionaluser'
,
name
=
'all_can_create'
,
field
=
models
.
BooleanField
(
default
=
False
,
help_text
=
"Tous les users peuvent en créer d'autres"
),
),
]
preferences/models.py
View file @
57f74f38
...
...
@@ -42,6 +42,10 @@ class OptionalUser(models.Model):
default
=
0
)
gpg_fingerprint
=
models
.
BooleanField
(
default
=
True
)
all_can_create
=
models
.
BooleanField
(
default
=
False
,
help_text
=
"Tous les users peuvent en créer d'autres"
,
)
def
clean
(
self
):
"""Creation du mode de paiement par solde"""
...
...
preferences/templates/preferences/display_preferences.html
View file @
57f74f38
...
...
@@ -52,6 +52,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<td>
{{ useroptions.solde_negatif }}
</td>
{% endif %}
</tr>
<tr>
<th>
Creations d'users par tous
</th>
<td>
{{ useroptions.all_can_create }}
</td>
</tr>
</table>
<h4>
Préférences machines
</h4>
{% if is_bureau %}
...
...
users/models.py
View file @
57f74f38
...
...
@@ -758,16 +758,23 @@ class User(AbstractBaseUser):
num
+=
1
return
composed_pseudo
(
num
)
def
can_create
(
user
):
options
,
_created
=
OptionalUser
.
objects
.
get_or_create
()
if
options
.
all_can_create
:
return
True
else
:
return
user
.
has_perms
((
'cableur'
,))
def
can_edit
(
self
,
user
):
if
self
.
is_class_club
and
user
.
is_class_adherent
:
return
self
==
user
or
user
.
has_perms
((
'cableur'
,))
or
\
return
self
==
user
or
user
.
has_perms
((
'cableur'
,))
or
\
user
.
adherent
in
self
.
club
.
administrators
.
all
()
else
:
return
self
==
user
or
user
.
has_perms
((
'cableur'
,))
def
can_view
(
self
,
user
):
if
self
.
is_class_club
and
user
.
is_class_adherent
:
return
self
==
user
or
user
.
has_perms
((
'cableur'
,))
or
\
return
self
==
user
or
user
.
has_perms
((
'cableur'
,))
or
\
user
.
adherent
in
self
.
club
.
administrators
.
all
()
or
\
user
.
adherent
in
self
.
club
.
members
.
all
()
else
:
...
...
users/templates/users/sidebar.html
View file @
57f74f38
...
...
@@ -26,21 +26,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block sidebar %}
{% if is_cableur %}
<a
class=
"list-group-item list-group-item-success"
href=
"{% url "
users:new-user
"
%}"
>
<i
class=
"glyphicon glyphicon-plus"
></i>
Créer un adhérent
</a>
<a
class=
"list-group-item list-group-item-success"
href=
"{% url "
users:new-club
"
%}"
>
<i
class=
"glyphicon glyphicon-plus"
></i>
Créer un club/association
</a>
{% endif %}
{% if is_cableur %}
<a
class=
"list-group-item list-group-item-success"
href=
"{% url "
users:new-user
"
%}"
>
<i
class=
"glyphicon glyphicon-plus"
></i>
Créer un adhérent
</a>
<a
class=
"list-group-item list-group-item-info"
href=
"{% url "
users:index-clubs
"
%}"
>
<i
class=
"glyphicon glyphicon-list"
></i>
Clubs et assos
</a>
{% if is_cableur %}
<a
class=
"list-group-item list-group-item-info"
href=
"{% url "
users:index
"
%}"
>
<i
class=
"glyphicon glyphicon-list"
></i>
Adherents
...
...
users/views.py
View file @
57f74f38
...
...
@@ -111,10 +111,15 @@ def password_change_action(u_form, user, request, req=False):
@
login_required
@
permission_required
(
'cableur'
)
def
new_user
(
request
):
""" Vue de création d'un nouvel utilisateur,
envoie un mail pour le mot de passe"""
if
not
User
.
can_create
(
request
.
user
):
messages
.
error
(
request
,
"Vous ne pouvez pas accéder à ce menu"
)
return
redirect
(
reverse
(
'users:profil'
,
kwargs
=
{
'userid'
:
str
(
request
.
user
.
id
)}
))
user
=
AdherentForm
(
request
.
POST
or
None
)
if
user
.
is_valid
():
user
=
user
.
save
(
commit
=
False
)
...
...
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