Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Fukász Rómeó Ervin
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
b718f6ba
authored
Aug 30, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: vm list performance upgrade
parent
8eb40129
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
circle/dashboard/templates/dashboard/vm-list.html
+6
-1
circle/dashboard/views.py
+2
-2
No files found.
circle/dashboard/templates/dashboard/vm-list.html
View file @
b718f6ba
...
@@ -86,7 +86,12 @@
...
@@ -86,7 +86,12 @@
<span>
{{ i.get_status_display }}
</span>
<span>
{{ i.get_status_display }}
</span>
</td>
</td>
<td>
<td>
{% include "dashboard/_display-name.html" with user=i.owner show_org=True %}
{% if i.owner.profile %}
{{ i.owner.profile.get_display_name }}
{% else %}
{{ i.owner.username }}
{% endif %}
{# include "dashboard/_display-name.html" with user=i.owner show_org=True #}
</td>
</td>
{% if user.is_superuser %}
{% if user.is_superuser %}
<td
class=
"node "
data-sort-value=
"{{ i.node.normalized_name }}"
>
<td
class=
"node "
data-sort-value=
"{{ i.node.normalized_name }}"
>
...
...
circle/dashboard/views.py
View file @
b718f6ba
...
@@ -1856,8 +1856,8 @@ class VmList(LoginRequiredMixin, FilterMixin, ListView):
...
@@ -1856,8 +1856,8 @@ class VmList(LoginRequiredMixin, FilterMixin, ListView):
queryset
=
queryset
.
order_by
(
sort
)
queryset
=
queryset
.
order_by
(
sort
)
return
queryset
.
filter
(
return
queryset
.
filter
(
**
self
.
get_queryset_filters
())
.
select_related
(
'owner'
,
'node'
**
self
.
get_queryset_filters
())
.
prefetch_related
(
)
.
distinct
()
"owner"
,
"node"
,
"owner__profile"
)
.
distinct
()
class
NodeList
(
LoginRequiredMixin
,
SuperuserRequiredMixin
,
SingleTableView
):
class
NodeList
(
LoginRequiredMixin
,
SuperuserRequiredMixin
,
SingleTableView
):
...
...
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