Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ares
re2o-ares-admin
Commits
17ba68cb
Commit
17ba68cb
authored
Jul 18, 2016
by
chirac
Browse files
Simplifie code moche
parent
2ad16def
Changes
2
Hide whitespace changes
Inline
Side-by-side
machines/templates/machines/machine.html
View file @
17ba68cb
...
...
@@ -4,14 +4,18 @@
{% block title %}Création et modification de machines{% endblock %}
{% block content %}
{% if machineform %}
{% bootstrap_form_errors machineform %}
{% endif %}
{% if interfaceform %}
{% bootstrap_form_errors interfaceform %}
{% endif %}
<form
class=
"form"
method=
"post"
>
{% csrf_token %}
{% if machineform %}
{% bootstrap_form machineform %}
{% endif %}
{% if interfaceform %}
{% bootstrap_form interfaceform %}
{% endif %}
...
...
machines/views.py
View file @
17ba68cb
...
...
@@ -150,12 +150,8 @@ def new_interface(request, machineid):
if
machine
.
user
!=
request
.
user
:
messages
.
error
(
request
,
"Vous ne pouvez pas ajouter une interface à une machine d'un autre user que vous sans droit"
)
return
redirect
(
"/users/profil/"
+
str
(
request
.
user
.
id
))
machine_form
=
BaseEditMachineForm
(
request
.
POST
or
None
,
instance
=
machine
)
else
:
machine_form
=
EditMachineForm
(
request
.
POST
or
None
,
instance
=
machine
)
interface_form
=
AddInterfaceForm
(
request
.
POST
or
None
)
if
interface_form
.
is_valid
()
and
machine_form
.
is_valid
():
machine_form
.
save
()
if
interface_form
.
is_valid
():
new_interface
=
interface_form
.
save
(
commit
=
False
)
new_interface
.
machine
=
machine
if
full_domain_validator
(
request
,
new_interface
,
machine
):
...
...
@@ -166,7 +162,7 @@ def new_interface(request, machineid):
new_interface
.
save
()
messages
.
success
(
request
,
"L'interface a été ajoutée"
)
return
redirect
(
"/machines/"
)
return
form
({
'machineform'
:
machine_form
,
'interfaceform'
:
interface_form
},
'machines/machine.html'
,
request
)
return
form
({
'interfaceform'
:
interface_form
},
'machines/machine.html'
,
request
)
@
login_required
def
del_interface
(
request
,
interfaceid
):
...
...
Write
Preview
Supports
Markdown
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