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
Nounous
re2o
Commits
145c6469
Commit
145c6469
authored
Nov 19, 2016
by
chirac
Browse files
Gère l'enregistrement origin A sur une zone
parent
7097cad7
Changes
5
Hide whitespace changes
Inline
Side-by-side
machines/admin.py
View file @
145c6469
...
...
@@ -14,7 +14,7 @@ class MachineTypeAdmin(VersionAdmin):
class
ExtensionAdmin
(
VersionAdmin
):
list_display
=
(
'name'
,)
list_display
=
(
'name'
,
'origin'
)
class
MxAdmin
(
VersionAdmin
):
list_display
=
(
'zone'
,
'priority'
,
'name'
)
...
...
machines/forms.py
View file @
145c6469
...
...
@@ -112,17 +112,18 @@ class DelIpTypeForm(ModelForm):
class
ExtensionForm
(
ModelForm
):
class
Meta
:
model
=
Extension
fields
=
[
'name'
]
fields
=
[
'name'
,
'origin'
]
def
__init__
(
self
,
*
args
,
**
kwargs
):
super
(
ExtensionForm
,
self
).
__init__
(
*
args
,
**
kwargs
)
self
.
fields
[
'name'
].
label
=
'Extension à ajouter'
self
.
fields
[
'origin'
].
label
=
'Enregistrement A origin'
class
DelExtensionForm
(
ModelForm
):
extensions
=
forms
.
ModelMultipleChoiceField
(
queryset
=
Extension
.
objects
.
all
(),
label
=
"Extensions actuelles"
,
widget
=
forms
.
CheckboxSelectMultiple
)
class
Meta
:
exclude
=
[
'name'
]
exclude
=
[
'name'
,
'origin'
]
model
=
Extension
class
MxForm
(
ModelForm
):
...
...
machines/migrations/0032_auto_20161119_1850.py
0 → 100644
View file @
145c6469
# -*- coding: utf-8 -*-
from
__future__
import
unicode_literals
from
django.db
import
migrations
,
models
import
django.db.models.deletion
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'machines'
,
'0031_auto_20161119_1709'
),
]
operations
=
[
migrations
.
AddField
(
model_name
=
'extension'
,
name
=
'origin'
,
field
=
models
.
OneToOneField
(
null
=
True
,
to
=
'machines.IpList'
,
blank
=
True
,
on_delete
=
django
.
db
.
models
.
deletion
.
PROTECT
),
),
migrations
.
AlterField
(
model_name
=
'extension'
,
name
=
'name'
,
field
=
models
.
CharField
(
max_length
=
255
,
unique
=
True
),
),
]
machines/models.py
View file @
145c6469
...
...
@@ -43,7 +43,8 @@ class IpType(models.Model):
class
Extension
(
models
.
Model
):
PRETTY_NAME
=
"Extensions dns"
name
=
models
.
CharField
(
max_length
=
255
)
name
=
models
.
CharField
(
max_length
=
255
,
unique
=
True
)
origin
=
models
.
OneToOneField
(
'IpList'
,
on_delete
=
models
.
PROTECT
,
blank
=
True
,
null
=
True
)
def
__str__
(
self
):
return
self
.
name
...
...
machines/templates/machines/aff_extension.html
View file @
145c6469
...
...
@@ -2,13 +2,15 @@
<thead>
<tr>
<th>
Extension
</th>
<th></th>
<th>
Enregistrement A origin
</th>
<th></th>
</tr>
</thead>
{% for extension in extension_list %}
<tr>
<td>
{{ extension.name }}
</td>
<td
class=
"text-right"
>
<td>
{{ extension.origin }}
</td>
<td
class=
"text-right"
>
{% if is_infra %}
{% include 'buttons/edit.html' with href='machines:edit-extension' id=extension.id %}
{% endif %}
...
...
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