Merge branch 'issue-242' into 'master'

Show parent template in vm-detail and template-detail

Closes #242

circle/dashboard/forms.py

@@ -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

@@ -23,6 +23,18 @@
         {% csrf_token %}
         {% csrf_token %}
 
 
         {{ form.name|as_crispy_field }}
         {{ form.name|as_crispy_field }}
+        <a {% if form.parent.value %}
+            href="{% url "dashboard.views.template-detail" pk=form.parent.value %}" 
+           {% else %}
+            disabled %}
+          {% endif %}
+          class="btn btn-default pull-right" style="margin-top: 24px;">
+          {% trans "Visit" %}
+          <i class="fa fa-arrow-circle-right"></i>
+        </a> 
+        <div style="width: 80%;">
+        {{ form.parent|as_crispy_field }}
+        </div>
 
 
         <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

@@ -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 %}