Merge branch 'hotplug' into 'master'

bugfix num_cores

See merge request !24

circle/dashboard/forms.py

@@ -563,6 +563,7 @@ class TemplateForm(forms.ModelForm):
             self.initial['priority'] = 10
             self.initial['priority'] = 10
             self.initial['ram_size'] = 512
             self.initial['ram_size'] = 512
             self.initial['max_ram_size'] = 512
             self.initial['max_ram_size'] = 512
+            self.initial['num_cores_max'] = 1
 
 
         lease_queryset = (
         lease_queryset = (
                 Lease.get_objects_with_level("operator", self.user).distinct() |
                 Lease.get_objects_with_level("operator", self.user).distinct() |

circle/dashboard/templates/dashboard/_template-create.html

@@ -15,6 +15,7 @@
   <legend>{% trans "Resource configuration" %}</legend>
   <legend>{% trans "Resource configuration" %}</legend>
   {% include "dashboard/_resources-sliders.html" with field_priority=form.priority field_num_cores=form.num_cores field_ram_size=form.ram_size %}
   {% include "dashboard/_resources-sliders.html" with field_priority=form.priority field_num_cores=form.num_cores field_ram_size=form.ram_size %}
   {{ form.max_ram_size|as_crispy_field }}
   {{ form.max_ram_size|as_crispy_field }}
+  {{ form.num_cores_max|as_crispy_field }}
 </fieldset>
 </fieldset>
 
 
 <fieldset>
 <fieldset>