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
5f9d66e5
authored
Aug 07, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: display parent tempalte in vm/template detail
parent
aef328d4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
1 deletions
+13
-1
circle/dashboard/forms.py
+2
-1
circle/dashboard/templates/dashboard/template-edit.html
+1
-0
circle/dashboard/templates/dashboard/vm-detail/home.html
+10
-0
No files found.
circle/dashboard/forms.py
View file @
5f9d66e5
...
@@ -552,7 +552,8 @@ class TemplateForm(forms.ModelForm):
...
@@ -552,7 +552,8 @@ class TemplateForm(forms.ModelForm):
exclude
=
(
'state'
,
'disks'
,
)
exclude
=
(
'state'
,
'disks'
,
)
widgets
=
{
widgets
=
{
'system'
:
forms
.
TextInput
,
'system'
:
forms
.
TextInput
,
'max_ram_size'
:
forms
.
HiddenInput
'max_ram_size'
:
forms
.
HiddenInput
,
'parent'
:
forms
.
Select
(
attrs
=
{
'disabled'
:
""
}),
}
}
...
...
circle/dashboard/templates/dashboard/template-edit.html
View file @
5f9d66e5
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
{% csrf_token %}
{% csrf_token %}
{{ form.name|as_crispy_field }}
{{ form.name|as_crispy_field }}
{{ form.parent|as_crispy_field }}
<fieldset
class=
"resources-sliders"
>
<fieldset
class=
"resources-sliders"
>
<legend>
{% trans "Resource configuration" %}
</legend>
<legend>
{% trans "Resource configuration" %}
</legend>
...
...
circle/dashboard/templates/dashboard/vm-detail/home.html
View file @
5f9d66e5
...
@@ -90,6 +90,16 @@
...
@@ -90,6 +90,16 @@
</div>
</div>
</form>
</form>
</div>
<!-- id:vm-details-tags -->
</div>
<!-- id:vm-details-tags -->
<dl>
<dt>
{% trans "Template" %}:
</dt>
<dd>
{% if instance.template %}
{{ instance.template.name }}
{% else %}
-
{% endif %}
</dd>
</dl>
</div>
</div>
<div
class=
"col-md-8"
>
<div
class=
"col-md-8"
>
{% if graphite_enabled %}
{% if graphite_enabled %}
...
...
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