Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
re2o
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nounous
re2o
Commits
ad853470
Commit
ad853470
authored
Dec 26, 2016
by
Gabriel Detraz
Committed by
root
Dec 26, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stretch fix
parent
0c7c48f0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
13 deletions
+12
-13
machines/serializers.py
machines/serializers.py
+11
-12
machines/views.py
machines/views.py
+1
-1
No files found.
machines/serializers.py
View file @
ad853470
...
...
@@ -17,9 +17,8 @@ class IpListSerializer(serializers.ModelSerializer):
class
InterfaceSerializer
(
serializers
.
ModelSerializer
):
ipv4
=
IpListSerializer
(
read_only
=
True
)
mac_address
=
serializers
.
SerializerMethodField
(
'get_macaddress'
)
dns
=
serializers
.
SerializerMethodField
(
'get_dns'
)
domain
=
serializers
.
SerializerMethodField
(
'get_dns'
)
extension
=
serializers
.
SerializerMethodField
(
'get_extension'
)
extension
=
serializers
.
SerializerMethodField
(
'get_
interface_
extension'
)
class
Meta
:
model
=
Interface
...
...
@@ -28,7 +27,7 @@ class InterfaceSerializer(serializers.ModelSerializer):
def
get_dns
(
self
,
obj
):
return
obj
.
domain
.
name
def
get_extension
(
self
,
obj
):
def
get_
interface_
extension
(
self
,
obj
):
return
obj
.
domain
.
extension
.
name
def
get_macaddress
(
self
,
obj
):
...
...
@@ -56,22 +55,22 @@ class ExtensionSerializer(serializers.ModelSerializer):
return
obj
.
origin
.
ipv4
class
MxSerializer
(
serializers
.
ModelSerializer
):
name
=
serializers
.
SerializerMethodField
(
'get_name'
)
name
=
serializers
.
SerializerMethodField
(
'get_
mx_
name'
)
zone
=
serializers
.
SerializerMethodField
(
'get_zone_name'
)
class
Meta
:
model
=
Mx
fields
=
(
'zone'
,
'priority'
,
'name'
)
def
get_name
(
self
,
obj
):
return
obj
.
name
def
get_
mx_
name
(
self
,
obj
):
return
str
(
obj
.
name
)
def
get_zone_name
(
self
,
obj
):
return
obj
.
zone
.
name
class
NsSerializer
(
serializers
.
ModelSerializer
):
zone
=
serializers
.
SerializerMethodField
(
'get_zone_name'
)
ns
=
serializers
.
SerializerMethodField
(
'get_
interface
_name'
)
ns
=
serializers
.
SerializerMethodField
(
'get_
domain
_name'
)
class
Meta
:
model
=
Ns
...
...
@@ -80,12 +79,12 @@ class NsSerializer(serializers.ModelSerializer):
def
get_zone_name
(
self
,
obj
):
return
obj
.
zone
.
name
def
get_
interface
_name
(
self
,
obj
):
return
obj
.
ns
def
get_
domain
_name
(
self
,
obj
):
return
str
(
obj
.
ns
)
class
DomainSerializer
(
serializers
.
ModelSerializer
):
extension
=
serializers
.
SerializerMethodField
(
'get_zone_name'
)
cname
=
serializers
.
SerializerMethodField
(
'get_cname'
)
cname
=
serializers
.
SerializerMethodField
(
'get_cname
_name
'
)
class
Meta
:
model
=
Domain
...
...
@@ -94,6 +93,6 @@ class DomainSerializer(serializers.ModelSerializer):
def
get_zone_name
(
self
,
obj
):
return
obj
.
extension
.
name
def
get_cname
(
self
,
obj
):
return
obj
.
cname
def
get_cname
_name
(
self
,
obj
):
return
str
(
obj
.
cname
)
machines/views.py
View file @
ad853470
...
...
@@ -706,7 +706,7 @@ def interface_list(request):
@
login_required
@
permission_required
(
'serveur'
)
def
alias
(
request
):
alias
=
Domain
.
objects
.
filter
(
interface_parent
=
None
)
.
filter
(
cname
=
Domain
.
objects
.
filter
(
interface_parent__in
=
Interface
.
objects
.
exclude
(
ipv4
=
None
)))
alias
=
Domain
.
objects
.
filter
(
interface_parent
=
None
)
.
filter
(
cname
__in
=
Domain
.
objects
.
filter
(
interface_parent__in
=
Interface
.
objects
.
exclude
(
ipv4
=
None
)))
seria
=
DomainSerializer
(
alias
,
many
=
True
)
return
JSONResponse
(
seria
.
data
)
...
...
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