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
d3f07cf6
Commit
d3f07cf6
authored
Jan 07, 2018
by
FERNET Laouen
Committed by
root
Jan 07, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removes hard-coded urls, calls reverse. Fix issue #63
parent
23732800
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
13 deletions
+16
-13
preferences/views.py
preferences/views.py
+1
-1
re2o/urls.py
re2o/urls.py
+1
-1
topologie/views.py
topologie/views.py
+11
-8
users/views.py
users/views.py
+3
-3
No files found.
preferences/views.py
View file @
d3f07cf6
...
...
@@ -90,7 +90,7 @@ def edit_options(request, section):
if
not
can
:
messages
.
error
(
request
,
msg
or
"Vous ne pouvez pas éditer cette
\
option."
)
return
redirect
(
'/'
)
return
redirect
(
reverse
(
'index'
)
)
options
=
form_instance
(
request
.
POST
or
None
,
instance
=
options_instance
...
...
re2o/urls.py
View file @
d3f07cf6
...
...
@@ -43,7 +43,7 @@ from django.contrib.auth import views as auth_views
from
.views
import
index
urlpatterns
=
[
url
(
r
'^$'
,
index
),
url
(
r
'^$'
,
index
,
name
=
'index'
),
url
(
'^logout/'
,
auth_views
.
logout
,
{
'next_page'
:
'/'
}),
url
(
'^'
,
include
(
'django.contrib.auth.urls'
)),
url
(
r
'^admin/'
,
include
(
admin
.
site
.
urls
)),
...
...
topologie/views.py
View file @
d3f07cf6
...
...
@@ -416,7 +416,7 @@ def create_ports(request, switch_id):
switch
=
Switch
.
objects
.
get
(
pk
=
switch_id
)
except
Switch
.
DoesNotExist
:
messages
.
error
(
request
,
u
"Switch inexistant"
)
return
redirect
(
"/topologie/"
)
return
redirect
(
reverse
(
'topologie:index'
)
)
s_begin
=
s_end
=
0
nb_ports
=
switch
.
ports
.
count
()
...
...
@@ -439,7 +439,10 @@ def create_ports(request, switch_id):
except
ValidationError
as
e
:
messages
.
error
(
request
,
''
.
join
(
e
))
return
redirect
(
"/topologie/switch/"
+
str
(
switch
.
id
))
return
redirect
(
reverse
(
'topologie:index-port'
,
kwargs
=
{
'switch_id'
:
switch_id
}
))
return
form
({
'id_switch'
:
switch_id
,
'topoform'
:
port_form
},
'topologie/switch.html'
,
request
)
...
...
@@ -573,7 +576,7 @@ def new_model_switch(request):
reversion
.
set_user
(
request
.
user
)
reversion
.
set_comment
(
"Création"
)
messages
.
success
(
request
,
"Le modèle a été créé"
)
return
redirect
(
"/topologie/index_model_switch/"
)
return
redirect
(
reverse
(
'topologie:index-model-switch'
)
)
return
form
({
'topoform'
:
model_switch
},
'topologie/topo.html'
,
request
)
...
...
@@ -591,7 +594,7 @@ def edit_model_switch(request, model_switch, model_switch_id):
field
for
field
in
model_switch
.
changed_data
)
)
messages
.
success
(
request
,
"Le modèle a bien été modifié"
)
return
redirect
(
"/topologie/index_model_switch/"
)
return
redirect
(
reverse
(
'topologie:index-model-switch'
)
)
return
form
({
'topoform'
:
model_switch
},
'topologie/topo.html'
,
request
)
...
...
@@ -609,7 +612,7 @@ def del_model_switch(request, model_switch_id):
except
ProtectedError
:
messages
.
error
(
request
,
"Le modèle %s est affectée à un autre objet,
\
impossible de la supprimer (switch ou user)"
%
model_switch
)
return
redirect
(
"/topologie/index_model_switch/"
)
return
redirect
(
reverse
(
'topologie:index-model-switch'
)
)
return
form
({
'objet'
:
model_switch
,
'objet_name'
:
'Modèle de switch'
...
...
@@ -627,7 +630,7 @@ def new_constructor_switch(request):
reversion
.
set_user
(
request
.
user
)
reversion
.
set_comment
(
"Création"
)
messages
.
success
(
request
,
"Le constructeur a été créé"
)
return
redirect
(
"/topologie/index_model_switch/"
)
return
redirect
(
reverse
(
'topologie:index-model-switch'
)
)
return
form
({
'topoform'
:
constructor_switch
},
'topologie/topo.html'
,
request
)
...
...
@@ -645,7 +648,7 @@ def edit_constructor_switch(request, constructor_switch, constructor_switch_id):
field
for
field
in
constructor_switch
.
changed_data
)
)
messages
.
success
(
request
,
"Le modèle a bien été modifié"
)
return
redirect
(
"/topologie/index_model_switch/"
)
return
redirect
(
reverse
(
'topologie:index-model-switch'
)
)
return
form
({
'topoform'
:
constructor_switch
},
'topologie/topo.html'
,
request
)
...
...
@@ -663,7 +666,7 @@ def del_constructor_switch(request, constructor_switch_id):
except
ProtectedError
:
messages
.
error
(
request
,
"Le constructeur %s est affecté à un autre objet,
\
impossible de la supprimer (switch ou user)"
%
constructor_switch
)
return
redirect
(
"/topologie/index_model_switch/"
)
return
redirect
(
reverse
(
'topologie:index-model-switch'
)
)
return
form
({
'objet'
:
constructor_switch
,
'objet_name'
:
'Constructeur de switch'
...
...
users/views.py
View file @
d3f07cf6
...
...
@@ -111,7 +111,7 @@ def password_change_action(u_form, user, request, req=False):
messages
.
success
(
request
,
"Le mot de passe a changé"
)
if
req
:
req
.
delete
()
return
redirect
(
"/"
)
return
redirect
(
reverse
(
'index'
)
)
return
redirect
(
reverse
(
'users:profil'
,
kwargs
=
{
'userid'
:
str
(
user
.
id
)}
...
...
@@ -809,7 +809,7 @@ def reset_password(request):
user
.
reset_passwd_mail
(
request
)
messages
.
success
(
request
,
"Un mail pour l'initialisation du mot
\
de passe a été envoyé"
)
redirect
(
"/"
)
redirect
(
reverse
(
'index'
)
)
return
form
({
'userform'
:
userform
},
'users/user.html'
,
request
)
...
...
@@ -822,7 +822,7 @@ def process(request, token):
return
process_passwd
(
request
,
req
)
else
:
messages
.
error
(
request
,
"Entrée incorrecte, contactez un admin"
)
redirect
(
"/"
)
redirect
(
reverse
(
'index'
)
)
def
process_passwd
(
request
,
req
):
...
...
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