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
6c594ac7
authored
Apr 28, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: sort vm list on server side
parent
c7b205a4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
5 deletions
+29
-5
circle/dashboard/templates/dashboard/vm-list.html
+20
-5
circle/dashboard/templates/dashboard/vm-list/header-link.html
+1
-0
circle/dashboard/views.py
+8
-0
No files found.
circle/dashboard/templates/dashboard/vm-list.html
View file @
6c594ac7
...
@@ -32,11 +32,26 @@
...
@@ -32,11 +32,26 @@
<div
class=
"panel-body"
>
<div
class=
"panel-body"
>
<table
class=
"table table-bordered table-striped table-hover vm-list-table"
>
<table
class=
"table table-bordered table-striped table-hover vm-list-table"
>
<thead><tr>
<thead><tr>
<th
class=
"orderable pk sortable vm-list-table-thin"
><a
href=
"?sort=pk"
>
{% trans "ID" %}
</a></th>
<th
data-sort=
"int"
class=
"orderable pk sortable vm-list-table-thin"
>
<th
class=
"name orderable sortable"
><a
href=
"?sort=name"
>
{% trans "Name" %}
</a></th>
{% trans "ID" as t %}
<th>
{% trans "State" %}
</th>
{% include "dashboard/vm-list/header-link.html" with name=t sort="pk" %}
<th
class=
"orderable sortable"
><a
href=
"?sort=owner"
>
{% trans "Owner" %}
</a></th>
</th>
{% if user.is_superuser %}
<th
class=
"orderable sortable"
><a
href=
"?sort=node"
>
{% trans "Node" %}
</a></th>
{% endif %}
<th
data-sort=
"string"
class=
"name orderable sortable"
>
{% trans "Name" as t %}
{% include "dashboard/vm-list/header-link.html" with name=t sort="name" %}
</th>
<th
data-sort=
"string"
>
{% trans "State" as t %}
{% include "dashboard/vm-list/header-link.html" with name=t sort="status" %}
</th>
<th
data-sort=
"string"
class=
"orderable sortable"
>
{% trans "Owner" as t %}
{% include "dashboard/vm-list/header-link.html" with name=t sort="owner" %}
</th>
{% if user.is_superuser %}
<th
data-sort=
"string"
class=
"orderable sortable"
>
{% trans "Node" as t %}
{% include "dashboard/vm-list/header-link.html" with name=t sort="node" %}
</th>
{% endif %}
</tr></thead><tbody>
</tr></thead><tbody>
{% for i in object_list %}
{% for i in object_list %}
<tr
class=
"{% cycle 'odd' 'even' %}"
>
<tr
class=
"{% cycle 'odd' 'even' %}"
>
...
...
circle/dashboard/templates/dashboard/vm-list/header-link.html
0 → 100644
View file @
6c594ac7
<a
href=
"?sort={% if request.GET.sort == sort %}-{% endif %}{{ sort }}"
>
{{ name }}
</a>
circle/dashboard/views.py
View file @
6c594ac7
...
@@ -989,6 +989,14 @@ class VmList(LoginRequiredMixin, ListView):
...
@@ -989,6 +989,14 @@ class VmList(LoginRequiredMixin, ListView):
s
=
self
.
request
.
GET
.
get
(
"s"
)
s
=
self
.
request
.
GET
.
get
(
"s"
)
if
s
:
if
s
:
queryset
=
queryset
.
filter
(
name__icontains
=
s
)
queryset
=
queryset
.
filter
(
name__icontains
=
s
)
sort
=
self
.
request
.
GET
.
get
(
"sort"
)
# remove "-" that means descending order
# also check if the column name is valid
if
(
sort
and
sort
.
replace
(
"-"
,
""
)
in
[
i
.
name
for
i
in
Instance
.
_meta
.
fields
]
+
[
"pk"
]):
queryset
=
queryset
.
order_by
(
sort
)
return
queryset
.
select_related
(
'owner'
,
'node'
)
return
queryset
.
select_related
(
'owner'
,
'node'
)
...
...
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