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
a8442fd0
Commit
a8442fd0
authored
May 27, 2017
by
Gabriel Detraz
Committed by
root
May 28, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Select_related et accélération des vues rest
Conflicts: machines/views.py
parent
6a85468a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
logs/views.py
logs/views.py
+1
-1
machines/views.py
machines/views.py
+7
-1
No files found.
logs/views.py
View file @
a8442fd0
...
...
@@ -68,7 +68,7 @@ def form(ctx, template, request):
@
login_required
@
permission_required
(
'cableur'
)
def
index
(
request
):
revisions
=
Revision
.
objects
.
all
().
order_by
(
'date_created'
).
reverse
()
revisions
=
Revision
.
objects
.
all
().
order_by
(
'date_created'
).
reverse
()
.
select_related
(
'user'
).
prefetch_related
(
'version_set__object'
)
paginator
=
Paginator
(
revisions
,
PAGINATION_NUMBER
)
page
=
request
.
GET
.
get
(
'page'
)
try
:
...
...
machines/views.py
View file @
a8442fd0
...
...
@@ -609,7 +609,7 @@ def del_alias(request, interfaceid):
@
login_required
@
permission_required
(
'cableur'
)
def
index
(
request
):
machines_list
=
Machine
.
objects
.
select_related
(
'user'
).
prefetch_related
(
'interface_set__domain__extension'
).
prefetch_related
(
'interface_set__ipv4__ip_type__extension'
).
prefetch_related
(
'interface_set__type'
).
order_by
(
'pk'
)
machines_list
=
Machine
.
objects
.
select_related
(
'user'
).
prefetch_related
(
'interface_set__domain__extension'
).
prefetch_related
(
'interface_set__ipv4__ip_type__extension'
).
prefetch_related
(
'interface_set__type'
).
prefetch_related
(
'interface_set__domain__related_domain'
).
order_by
(
'pk'
)
paginator
=
Paginator
(
machines_list
,
PAGINATION_LARGE_NUMBER
)
page
=
request
.
GET
.
get
(
'page'
)
try
:
...
...
@@ -637,9 +637,15 @@ def index_machinetype(request):
@
login_required
@
permission_required
(
'cableur'
)
def
index_extension
(
request
):
<<<<<<<
HEAD
extension_list
=
Extension
.
objects
.
order_by
(
'name'
)
mx_list
=
Mx
.
objects
.
order_by
(
'zone'
)
ns_list
=
Ns
.
objects
.
order_by
(
'zone'
)
=======
extension_list
=
Extension
.
objects
.
select_related
(
'origin'
).
order_by
(
'name'
)
mx_list
=
Mx
.
objects
.
order_by
(
'zone'
).
select_related
(
'zone'
).
select_related
(
'name__extension'
)
ns_list
=
Ns
.
objects
.
order_by
(
'zone'
).
select_related
(
'zone'
).
select_related
(
'ns__extension'
)
>>>>>>>
39
f3994
...
Select_related
et
accélération
des
vues
rest
return
render
(
request
,
'machines/index_extension.html'
,
{
'extension_list'
:
extension_list
,
'mx_list'
:
mx_list
,
'ns_list'
:
ns_list
})
@
login_required
...
...
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