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
A prog2-höz tartozó friss repo anyagok itt elérhetőek:
https://git.iit.bme.hu/
Commit
d0f18ec8
authored
Apr 04, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: fix console not enabling because of upper case/translated state name
parent
0afb1934
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
circle/dashboard/static/dashboard/vm-details.js
+1
-1
circle/dashboard/views.py
+2
-1
No files found.
circle/dashboard/static/dashboard/vm-details.js
View file @
d0f18ec8
...
...
@@ -215,7 +215,7 @@ function checkNewActivity(only_state, runs) {
}
$
(
"#vm-details-state i"
).
prop
(
"class"
,
data
[
'icon'
]);
$
(
"#vm-details-state span"
).
html
(
data
[
'state'
].
toUpperCase
());
$
(
"#vm-details-state span"
).
html
(
data
[
'
human_readable_
state'
].
toUpperCase
());
if
(
data
[
'state'
]
==
"RUNNING"
)
{
$
(
"[data-target=#_console]"
).
attr
(
"data-toggle"
,
"pill"
).
attr
(
"href"
,
"#console"
).
parent
(
"li"
).
removeClass
(
"disabled"
);
}
else
{
...
...
circle/dashboard/views.py
View file @
d0f18ec8
...
...
@@ -1615,7 +1615,8 @@ def vm_activity(request, pk):
response
=
{}
only_state
=
request
.
GET
.
get
(
"only_state"
)
response
[
'state'
]
=
instance
.
get_status_display
()
response
[
'human_readable_state'
]
=
instance
.
get_status_display
()
response
[
'state'
]
=
instance
.
state
response
[
'icon'
]
=
instance
.
get_status_icon
()
if
only_state
is
not
None
and
only_state
==
"false"
:
# instance activity
context
=
{
...
...
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