Merge master into task/5681/offer-512mb-ram
This commit is contained in:
commit
5452c1c478
5 changed files with 36 additions and 4 deletions
|
|
@ -92,11 +92,14 @@ 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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue