Merge master into task/5681/offer-512mb-ram
This commit is contained in:
commit
5452c1c478
5 changed files with 36 additions and 4 deletions
|
@ -1,4 +1,5 @@
|
|||
Next:
|
||||
2.2.2: 2018-09-28
|
||||
* #5721: Set calculator OS list in alphabetical order and set `Devuan Ascii` as the default (PR #668)
|
||||
* bugfix: Fix some typos and correct DE translations (PR #667)
|
||||
2.2.1: 2018-09-25
|
||||
* feature: Change DCLNavbarPlugin to show login option only if set (PR #665)
|
||||
|
|
|
@ -354,4 +354,11 @@ class DCLCalculatorPluginModel(CMSPlugin):
|
|||
"in the backend to be automatically listed in this "
|
||||
"calculator instance."
|
||||
)
|
||||
default_selected_template = models.CharField(
|
||||
default="Devuan Ascii",
|
||||
null=True,
|
||||
max_length=128,
|
||||
help_text="Write the name of the template that you need selected as"
|
||||
" default when the calculator loads"
|
||||
)
|
||||
enable_512mb_ram = models.BooleanField(default=False)
|
||||
|
|
|
@ -92,10 +92,13 @@ class DCLCalculatorPlugin(CMSPluginBase):
|
|||
if ids:
|
||||
context['templates'] = VMTemplate.objects.filter(
|
||||
vm_type=instance.vm_type
|
||||
).filter(opennebula_vm_template_id__in=ids)
|
||||
).filter(opennebula_vm_template_id__in=ids).order_by('name')
|
||||
else:
|
||||
context['templates'] = VMTemplate.objects.filter(
|
||||
vm_type=instance.vm_type
|
||||
).order_by('name')
|
||||
context['default_selected_template'] = (
|
||||
instance.default_selected_template
|
||||
)
|
||||
context['min_ram'] = 0.5 if instance.enable_512mb_ram else 1
|
||||
return context
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.9.4 on 2018-09-27 20:32
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('datacenterlight', '0025_dclnavbarpluginmodel_show_login_option'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='dclcalculatorpluginmodel',
|
||||
name='default_selected_template',
|
||||
field=models.CharField(default='Devuan Ascii', help_text='Write the name of the template that you need selected as default when the calculator loads', max_length=128, null=True),
|
||||
),
|
||||
]
|
|
@ -92,7 +92,8 @@
|
|||
<label for="config">OS</label>
|
||||
<select name="config">
|
||||
{% for template in templates %}
|
||||
<option value="{{template.opennebula_vm_template_id}}">{{template.name}}</option>
|
||||
|
||||
<option value="{{template.opennebula_vm_template_id}}" {% if template.name|lower == default_selected_template|lower %}selected="selected"{% endif %}>{{template.name}}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue