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
d56aeab7
authored
Feb 14, 2014
by
Guba Sándor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
node: fixed states to begin with capital
parent
8f58c693
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
circle/dashboard/templates/dashboard/node-detail.html
+4
-4
circle/vm/models/node.py
+3
-4
No files found.
circle/dashboard/templates/dashboard/node-detail.html
View file @
d56aeab7
...
@@ -9,10 +9,10 @@
...
@@ -9,10 +9,10 @@
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-md-4"
id=
"node-info-pane"
>
<div
class=
"col-md-4"
id=
"node-info-pane"
>
<div
id=
"node-info-data"
class=
"big"
>
<div
id=
"node-info-data"
class=
"big"
>
<span
id=
"node-status-label"
class=
"label {% if node.state == '
o
nline' %}label-success
<span
id=
"node-status-label"
class=
"label {% if node.state == '
O
nline' %}label-success
{% elif node.state == '
m
issing' %}label-danger
{% elif node.state == '
M
issing' %}label-danger
{% elif node.state == '
d
isabled' %}label-warning
{% elif node.state == '
D
isabled' %}label-warning
{% elif node.state == '
o
ffline' %}label-warning
{% elif node.state == '
O
ffline' %}label-warning
{% endif %}"
>
{{ node.state }}
</span>
{% endif %}"
>
{{ node.state }}
</span>
<div
class=
"btn-group"
>
<div
class=
"btn-group"
>
{% with node as record %}
{% with node as record %}
...
...
circle/vm/models/node.py
View file @
d56aeab7
...
@@ -74,13 +74,12 @@ class Node(TimeStampedModel):
...
@@ -74,13 +74,12 @@ class Node(TimeStampedModel):
"""
"""
if
self
.
enabled
and
self
.
online
:
if
self
.
enabled
and
self
.
online
:
return
'
o
nline'
return
'
O
nline'
elif
self
.
enabled
and
not
self
.
online
:
elif
self
.
enabled
and
not
self
.
online
:
return
'
m
issing'
return
'
M
issing'
elif
not
self
.
enabled
and
self
.
online
:
elif
not
self
.
enabled
and
self
.
online
:
return
'
d
isabled'
return
'
D
isabled'
else
:
else
:
return
'offline'
return
'Offline'
return
'Offline'
def
disable
(
self
,
user
=
None
):
def
disable
(
self
,
user
=
None
):
...
...
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