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
bb377d91
authored
Aug 28, 2014
by
Őry Máté
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: show if mass op is denied by permission
parent
13bfd1ff
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
circle/dashboard/static/dashboard/dashboard.css
+1
-1
circle/dashboard/templates/dashboard/mass-operate.html
+5
-4
circle/dashboard/views.py
+2
-1
No files found.
circle/dashboard/static/dashboard/dashboard.css
View file @
bb377d91
...
...
@@ -934,7 +934,7 @@ textarea[name="list-new-namelist"] {
}
.mass-op-panel
.status-icon
{
font-size
:
1.5
em
;
font-size
:
.8
em
;
}
#vm-list-search
,
#vm-mass-ops
{
...
...
circle/dashboard/templates/dashboard/mass-operate.html
View file @
bb377d91
...
...
@@ -17,10 +17,11 @@ Do you want to perform the <strong>{{op}}</strong> operation on the following {{
<div
class=
"panel panel-default mass-op-panel"
>
<i
class=
"fa {{ i.get_status_icon }} fa-fw"
></i>
{{ i.name }} ({{ i.pk }})
<div
style=
"float: right;"
title=
"{{ i.disabled }}"
>
<i
class=
"fa status-icon
{% if i.disabled %}fa-minus-square minus{% else %}fa-check-square check{% endif %}"
>
</i>
<div
style=
"float: right;"
title=
"{{ i.disabled }}"
class=
"status-icon"
>
<span
class=
"fa-stack"
>
<i
class=
"fa fa-stack-2x fa-square {{ i.disabled|yesno:"
minus
,
check
"
}}"
></i>
<i
class=
"fa fa-stack-1x fa-inverse fa-{% if i.disabled %}{{i.disabled_icon|default:"
minus
"}}{%
else
%}
check
{%
endif
%}"
></i>
</span>
</div>
</div>
<input
type=
"checkbox"
name=
"vm"
value=
"{{ i.pk }}"
{%
if
not
i
.
disabled
%}
checked
{%
endif
%}
...
...
circle/dashboard/views.py
View file @
bb377d91
...
...
@@ -78,7 +78,8 @@ from .tables import (
GroupListTable
,
UserKeyListTable
)
from
common.models
import
(
HumanReadableObject
,
HumanReadableException
,
fetch_human_exception
HumanReadableObject
,
HumanReadableException
,
fetch_human_exception
,
create_readable
,
)
from
vm.models
import
(
Instance
,
instance_activity
,
InstanceActivity
,
InstanceTemplate
,
Interface
,
...
...
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