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
392da873
authored
Oct 31, 2014
by
Bach Dániel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vm: handle node.driver_version errors
parent
53d054a1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletions
+3
-1
circle/dashboard/templates/dashboard/node-detail/resources.html
+2
-0
circle/vm/models/node.py
+1
-1
No files found.
circle/dashboard/templates/dashboard/node-detail/resources.html
View file @
392da873
...
@@ -12,11 +12,13 @@
...
@@ -12,11 +12,13 @@
<dt>
{% trans "Priority" %}:
</dt><dd>
{{ node.priority }}
</dd>
<dt>
{% trans "Priority" %}:
</dt><dd>
{{ node.priority }}
</dd>
<dt>
{% trans "Driver Version:" %}
</dt>
<dt>
{% trans "Driver Version:" %}
</dt>
<dd>
<dd>
{% if node.driver_version %}
{{ node.driver_version.branch }} at
{{ node.driver_version.branch }} at
{{ node.driver_version.commit }} ({{ node.driver_version.commit_text }})
{{ node.driver_version.commit }} ({{ node.driver_version.commit_text }})
{% if node.driver_version.is_dirty %}
{% if node.driver_version.is_dirty %}
<span
class=
"label label-danger"
>
{% trans "with uncommitted changes!" %}
</span>
<span
class=
"label label-danger"
>
{% trans "with uncommitted changes!" %}
</span>
{% endif %}
{% endif %}
{% endif %}
</dd>
</dd>
<dt>
{% trans "Host owner" %}:
</dt>
<dt>
{% trans "Host owner" %}:
</dt>
<dd>
<dd>
...
...
circle/vm/models/node.py
View file @
392da873
...
@@ -291,7 +291,7 @@ class Node(OperatedMixin, TimeStampedModel):
...
@@ -291,7 +291,7 @@ class Node(OperatedMixin, TimeStampedModel):
@property
@property
@node_available
@node_available
def
driver_version
(
self
):
def
driver_version
(
self
):
return
self
.
info
[
'driver_version'
]
return
self
.
info
.
get
(
'driver_version'
)
@property
@property
@node_available
@node_available
...
...
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