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
A prog2-höz tartozó friss repo anyagok itt elérhetőek:
https://git.iit.bme.hu/
Commit
9ffd118c
authored
Sep 08, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: remove lease box if no perms
parent
2b450c1f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
66 additions
and
3 deletions
+66
-3
circle/dashboard/tables.py
+1
-0
circle/dashboard/templates/dashboard/template-list.html
+4
-1
circle/dashboard/templates/django_tables2/table_no_page.html
+52
-0
circle/dashboard/views.py
+9
-2
No files found.
circle/dashboard/tables.py
View file @
9ffd118c
...
@@ -222,6 +222,7 @@ class LeaseListTable(Table):
...
@@ -222,6 +222,7 @@ class LeaseListTable(Table):
fields
=
(
'name'
,
'suspend_interval_seconds'
,
fields
=
(
'name'
,
'suspend_interval_seconds'
,
'delete_interval_seconds'
,
)
'delete_interval_seconds'
,
)
prefix
=
"lease-"
prefix
=
"lease-"
empty_text
=
_
(
"No available leases."
)
class
UserKeyListTable
(
Table
):
class
UserKeyListTable
(
Table
):
...
...
circle/dashboard/templates/dashboard/template-list.html
View file @
9ffd118c
...
@@ -39,12 +39,14 @@
...
@@ -39,12 +39,14 @@
</div>
</div>
</div>
</div>
{% if show_lease_table %}
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-md-6"
>
<div
class=
"col-md-6"
>
<div
class=
"panel panel-default"
>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
>
<div
class=
"panel-heading"
>
{% if perms.vm.create_leases %}
{% if perms.vm.create_leases %}
<a
href=
"{% url "
dashboard
.
views
.
lease-create
"
%}"
class=
"pull-right btn btn-success btn-xs"
style=
"margin-right: 10px;"
>
<a
href=
"{% url "
dashboard
.
views
.
lease-create
"
%}"
class=
"pull-right btn btn-success btn-xs"
style=
"margin-right: 10px;"
>
<i
class=
"fa fa-plus"
></i>
{% trans "new lease" %}
<i
class=
"fa fa-plus"
></i>
{% trans "new lease" %}
</a>
</a>
{% endif %}
{% endif %}
...
@@ -71,6 +73,7 @@
...
@@ -71,6 +73,7 @@
</div>
</div>
{% endcomment %}
{% endcomment %}
</div>
</div>
{% endif %}
{% endblock %}
{% endblock %}
{% block extra_js %}
{% block extra_js %}
...
...
circle/dashboard/templates/django_tables2/table_no_page.html
0 → 100644
View file @
9ffd118c
{% spaceless %}
{% load django_tables2 %}
{% load i18n %}
{% if table.page %}
<div
class=
"table-container"
>
{% endif %}
{% block table %}
<table
{%
if
table
.
attrs
%}
{{
table
.
attrs
.
as_html
}}{%
endif
%}
>
{% nospaceless %}
{% block table.thead %}
<thead>
<tr>
{% for column in table.columns %}
{% if column.orderable %}
<th
{{
column
.
attrs
.
th
.
as_html
}}
><a
href=
"{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}"
>
{{ column.header }}
</a></th>
{% else %}
<th
{{
column
.
attrs
.
th
.
as_html
}}
>
{{ column.header }}
</th>
{% endif %}
{% endfor %}
</tr>
</thead>
{% endblock table.thead %}
{% block table.tbody %}
<tbody>
{% for row in table.page.object_list|default:table.rows %} {# support pagination #}
{% block table.tbody.row %}
<tr
class=
"{{ forloop.counter|divisibleby:2|yesno:"
even
,
odd
"
}}"
>
{# avoid cycle for Django 1.2-1.6 compatibility #}
{% for column, cell in row.items %}
<td
{{
column
.
attrs
.
td
.
as_html
}}
>
{% if column.localize == None %}{{ cell }}{% else %}{% if column.localize %}{{ cell|localize }}{% else %}{{ cell|unlocalize }}{% endif %}{% endif %}
</td>
{% endfor %}
</tr>
{% endblock table.tbody.row %}
{% empty %}
{% if table.empty_text %}
{% block table.tbody.empty_text %}
<tr><td
colspan=
"{{ table.columns|length }}"
>
{{ table.empty_text }}
</td></tr>
{% endblock table.tbody.empty_text %}
{% endif %}
{% endfor %}
</tbody>
{% endblock table.tbody %}
{% block table.tfoot %}
<tfoot></tfoot>
{% endblock table.tfoot %}
{% endnospaceless %}
</table>
{% endblock table %}
{% if table.page %}
</div>
{% endif %}
{% endspaceless %}
circle/dashboard/views.py
View file @
9ffd118c
...
@@ -1756,9 +1756,16 @@ class TemplateList(LoginRequiredMixin, FilterMixin, SingleTableView):
...
@@ -1756,9 +1756,16 @@ class TemplateList(LoginRequiredMixin, FilterMixin, SingleTableView):
def
get_context_data
(
self
,
*
args
,
**
kwargs
):
def
get_context_data
(
self
,
*
args
,
**
kwargs
):
context
=
super
(
TemplateList
,
self
)
.
get_context_data
(
*
args
,
**
kwargs
)
context
=
super
(
TemplateList
,
self
)
.
get_context_data
(
*
args
,
**
kwargs
)
user
=
self
.
request
.
user
leases_w_operator
=
Lease
.
get_objects_with_level
(
"operator"
,
user
)
context
[
'lease_table'
]
=
LeaseListTable
(
context
[
'lease_table'
]
=
LeaseListTable
(
Lease
.
get_objects_with_level
(
"user"
,
self
.
request
.
user
),
leases_w_operator
,
request
=
self
.
request
,
request
=
self
.
request
)
template
=
"django_tables2/table_no_page.html"
,
)
context
[
'show_lease_table'
]
=
(
leases_w_operator
.
count
()
>
0
or
user
.
has_perm
(
"vm.create_leases"
)
)
context
[
'search_form'
]
=
self
.
search_form
context
[
'search_form'
]
=
self
.
search_form
...
...
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