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
A prog2-höz tartozó friss repo anyagok itt elérhetőek:
https://git.iit.bme.hu/
Commit
8b6f79aa
authored
Sep 23, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: show node on vm
parent
d6f8ae38
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
0 deletions
+20
-0
circle/dashboard/templates/dashboard/vm-detail/home.html
+13
-0
circle/vm/operations.py
+7
-0
No files found.
circle/dashboard/templates/dashboard/vm-detail/home.html
View file @
8b6f79aa
...
@@ -90,6 +90,19 @@
...
@@ -90,6 +90,19 @@
</div>
</div>
</form>
</form>
</div>
<!-- id:vm-details-tags -->
</div>
<!-- id:vm-details-tags -->
{% if request.user.is_superuser %}
<dl>
<dt>
Node:
</dt>
{% if instance.node %}
<dd>
<a
href=
"{{ instance.node.get_absolute_url }}"
>
{{ instance.node.name }}
</a>
</dd>
{% else %}
-
{% endif %}
{% endif %}
<dl>
<dl>
<dt>
{% trans "Template" %}:
</dt>
<dt>
{% trans "Template" %}:
</dt>
<dd>
<dd>
...
...
circle/vm/operations.py
View file @
8b6f79aa
...
@@ -758,6 +758,13 @@ class WakeUpOperation(InstanceOperation):
...
@@ -758,6 +758,13 @@ class WakeUpOperation(InstanceOperation):
"deploy network"
)):
"deploy network"
)):
self
.
instance
.
deploy_net
()
self
.
instance
.
deploy_net
()
activity
.
result
=
create_readable
(
""
,
ugettext_noop
(
"Scheduled to
%(node)
s"
%
{
'node'
:
self
.
instance
.
node
.
name
}
)
)
try
:
try
:
self
.
instance
.
renew
(
parent_activity
=
activity
)
self
.
instance
.
renew
(
parent_activity
=
activity
)
except
:
except
:
...
...
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