Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
870fde3d
authored
Jul 27, 2016
by
Dóbé Péter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: fix activity code checking
parent
83bf10a7
Pipeline
#149
passed with stage
in 0 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
circle/dashboard/views/vm.py
+2
-1
No files found.
circle/dashboard/views/vm.py
View file @
870fde3d
...
@@ -46,6 +46,7 @@ from braces.views import SuperuserRequiredMixin, LoginRequiredMixin
...
@@ -46,6 +46,7 @@ from braces.views import SuperuserRequiredMixin, LoginRequiredMixin
from
common.models
import
(
from
common.models
import
(
create_readable
,
HumanReadableException
,
fetch_human_exception
,
create_readable
,
HumanReadableException
,
fetch_human_exception
,
split_activity_code
,
)
)
from
firewall.models
import
Vlan
,
Host
,
Rule
from
firewall.models
import
Vlan
,
Host
,
Rule
from
manager.scheduler
import
SchedulerError
from
manager.scheduler
import
SchedulerError
...
@@ -798,7 +799,7 @@ def _get_activity_icon(act):
...
@@ -798,7 +799,7 @@ def _get_activity_icon(act):
op
=
act
.
get_operation
()
op
=
act
.
get_operation
()
if
op
and
op
.
id
in
vm_ops
:
if
op
and
op
.
id
in
vm_ops
:
return
vm_ops
[
op
.
id
]
.
icon
return
vm_ops
[
op
.
id
]
.
icon
elif
act
.
activity_code
==
u'vm.Instance.
console-accessed'
:
elif
split_activity_code
(
act
.
activity_code
)[
-
1
]
==
u'
console-accessed'
:
return
"terminal"
return
"terminal"
else
:
else
:
return
"cog"
return
"cog"
...
...
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