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
46663eeb
Commit
46663eeb
authored
Jul 07, 2016
by
chirac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Redirections plus intelligentes et erreurs non silencieuses
parent
79cf47e8
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
cotisations/views.py
cotisations/views.py
+1
-1
machines/views.py
machines/views.py
+1
-1
topologie/views.py
topologie/views.py
+1
-1
users/views.py
users/views.py
+6
-6
No files found.
cotisations/views.py
View file @
46663eeb
...
@@ -66,7 +66,7 @@ def new_facture(request, userid):
...
@@ -66,7 +66,7 @@ def new_facture(request, userid):
messages
.
success
(
request
,
"La cotisation a été prolongée pour l'adhérent %s "
%
user
.
name
)
messages
.
success
(
request
,
"La cotisation a été prolongée pour l'adhérent %s "
%
user
.
name
)
else
:
else
:
messages
.
success
(
request
,
"La facture a été crée"
)
messages
.
success
(
request
,
"La facture a été crée"
)
return
redirect
(
"/cotisations/
"
)
return
redirect
(
"/cotisations/
profil/"
+
userid
)
return
form
({
'factureform'
:
facture_form
},
'cotisations/facture.html'
,
request
)
return
form
({
'factureform'
:
facture_form
},
'cotisations/facture.html'
,
request
)
def
edit_facture
(
request
,
factureid
):
def
edit_facture
(
request
,
factureid
):
...
...
machines/views.py
View file @
46663eeb
...
@@ -66,7 +66,7 @@ def new_machine(request, userid):
...
@@ -66,7 +66,7 @@ def new_machine(request, userid):
messages
.
error
(
request
,
u
"Il n'y a plus d'ip disponibles"
)
messages
.
error
(
request
,
u
"Il n'y a plus d'ip disponibles"
)
new_interface
.
save
()
new_interface
.
save
()
messages
.
success
(
request
,
"La machine a été crée"
)
messages
.
success
(
request
,
"La machine a été crée"
)
return
redirect
(
"/users/
"
)
return
redirect
(
"/users/
profil/"
+
userid
)
return
form
({
'machineform'
:
machine
,
'interfaceform'
:
interface
},
'machines/machine.html'
,
request
)
return
form
({
'machineform'
:
machine
,
'interfaceform'
:
interface
},
'machines/machine.html'
,
request
)
def
edit_machine
(
request
,
interfaceid
):
def
edit_machine
(
request
,
interfaceid
):
...
...
topologie/views.py
View file @
46663eeb
...
@@ -34,7 +34,7 @@ def new_port(request, switch_id):
...
@@ -34,7 +34,7 @@ def new_port(request, switch_id):
port
.
save
()
port
.
save
()
messages
.
success
(
request
,
"Port ajouté"
)
messages
.
success
(
request
,
"Port ajouté"
)
except
IntegrityError
:
except
IntegrityError
:
pass
messages
.
error
(
request
,
"Ce port existe déjà"
)
return
redirect
(
"/topologie/switch/"
+
switch_id
)
return
redirect
(
"/topologie/switch/"
+
switch_id
)
return
form
({
'topoform'
:
port
},
'topologie/port.html'
,
request
)
return
form
({
'topoform'
:
port
},
'topologie/port.html'
,
request
)
...
...
users/views.py
View file @
46663eeb
...
@@ -93,7 +93,7 @@ def edit_info(request, userid):
...
@@ -93,7 +93,7 @@ def edit_info(request, userid):
if
user
.
is_valid
():
if
user
.
is_valid
():
user
.
save
()
user
.
save
()
messages
.
success
(
request
,
"L'user a bien été modifié"
)
messages
.
success
(
request
,
"L'user a bien été modifié"
)
return
redirect
(
"/users/
"
)
return
redirect
(
"/users/
profil/"
+
userid
)
return
form
({
'userform'
:
user
},
'users/user.html'
,
request
)
return
form
({
'userform'
:
user
},
'users/user.html'
,
request
)
def
state
(
request
,
userid
):
def
state
(
request
,
userid
):
...
@@ -111,7 +111,7 @@ def state(request, userid):
...
@@ -111,7 +111,7 @@ def state(request, userid):
unarchive
(
user
)
unarchive
(
user
)
state
.
save
()
state
.
save
()
messages
.
success
(
request
,
"Etat changé avec succès"
)
messages
.
success
(
request
,
"Etat changé avec succès"
)
return
redirect
(
"/users/
"
)
return
redirect
(
"/users/
profil/"
+
userid
)
return
form
({
'userform'
:
state
},
'users/user.html'
,
request
)
return
form
({
'userform'
:
state
},
'users/user.html'
,
request
)
def
password
(
request
,
userid
):
def
password
(
request
,
userid
):
...
@@ -129,7 +129,7 @@ def password(request, userid):
...
@@ -129,7 +129,7 @@ def password(request, userid):
user
.
pwd_ntlm
=
hashNT
(
user_form
.
cleaned_data
[
'passwd1'
])
user
.
pwd_ntlm
=
hashNT
(
user_form
.
cleaned_data
[
'passwd1'
])
user
.
save
()
user
.
save
()
messages
.
success
(
request
,
"Le mot de passe a changé"
)
messages
.
success
(
request
,
"Le mot de passe a changé"
)
return
redirect
(
"/users/
"
)
return
redirect
(
"/users/
profil/"
+
userid
)
return
form
({
'userform'
:
user_form
},
'users/user.html'
,
request
)
return
form
({
'userform'
:
user_form
},
'users/user.html'
,
request
)
def
add_right
(
request
,
userid
):
def
add_right
(
request
,
userid
):
...
@@ -147,7 +147,7 @@ def add_right(request, userid):
...
@@ -147,7 +147,7 @@ def add_right(request, userid):
messages
.
success
(
request
,
"Droit ajouté"
)
messages
.
success
(
request
,
"Droit ajouté"
)
except
IntegrityError
:
except
IntegrityError
:
pass
pass
return
redirect
(
"/users/
"
)
return
redirect
(
"/users/
profil/"
+
userid
)
return
form
({
'userform'
:
right
},
'users/user.html'
,
request
)
return
form
({
'userform'
:
right
},
'users/user.html'
,
request
)
def
del_right
(
request
):
def
del_right
(
request
):
...
@@ -170,7 +170,7 @@ def add_ban(request, userid):
...
@@ -170,7 +170,7 @@ def add_ban(request, userid):
if
ban
.
is_valid
():
if
ban
.
is_valid
():
ban
.
save
()
ban
.
save
()
messages
.
success
(
request
,
"Bannissement ajouté"
)
messages
.
success
(
request
,
"Bannissement ajouté"
)
return
redirect
(
"/users/
"
)
return
redirect
(
"/users/
profil/"
+
userid
)
if
is_ban
(
user
):
if
is_ban
(
user
):
messages
.
error
(
request
,
u
"Attention, cet utilisateur a deja un bannissement actif"
)
messages
.
error
(
request
,
u
"Attention, cet utilisateur a deja un bannissement actif"
)
return
form
({
'userform'
:
ban
},
'users/user.html'
,
request
)
return
form
({
'userform'
:
ban
},
'users/user.html'
,
request
)
...
@@ -199,7 +199,7 @@ def add_whitelist(request, userid):
...
@@ -199,7 +199,7 @@ def add_whitelist(request, userid):
if
whitelist
.
is_valid
():
if
whitelist
.
is_valid
():
whitelist
.
save
()
whitelist
.
save
()
messages
.
success
(
request
,
"Accès à titre gracieux accordé"
)
messages
.
success
(
request
,
"Accès à titre gracieux accordé"
)
return
redirect
(
"/users/
"
)
return
redirect
(
"/users/
profil/"
+
userid
)
if
is_whitelisted
(
user
):
if
is_whitelisted
(
user
):
messages
.
error
(
request
,
u
"Attention, cet utilisateur a deja un accès gracieux actif"
)
messages
.
error
(
request
,
u
"Attention, cet utilisateur a deja un accès gracieux actif"
)
return
form
({
'userform'
:
whitelist
},
'users/user.html'
,
request
)
return
form
({
'userform'
:
whitelist
},
'users/user.html'
,
request
)
...
...
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