mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Simplify logic to set min_ram in the calculator form

Browse source
This commit is contained in:
PCoder 2018-09-27 09:06:39 +02:00
parent da21699212
commit 12f139976d
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
datacenterlight/cms_plugins.py
View file

@ -97,8 +97,7 @@ class DCLCalculatorPlugin(CMSPluginBase):
context['templates'] = VMTemplate.objects.filter( context['templates'] = VMTemplate.objects.filter(
vm_type=instance.vm_type vm_type=instance.vm_type
) )
if instance.enable_512mb_ram: context['min_ram'] = 0.5 if instance.enable_512mb_ram else 1
context['enable_512mb_ram'] = True
return context return context

7
datacenterlight/templates/datacenterlight/includes/_calculator_form.html
View file

@ -9,7 +9,7 @@
window.ssdUnitPrice = {{vm_pricing.ssd_unit_price|default:0}}; window.ssdUnitPrice = {{vm_pricing.ssd_unit_price|default:0}};
window.hddUnitPrice = {{vm_pricing.hdd_unit_price|default:0}}; window.hddUnitPrice = {{vm_pricing.hdd_unit_price|default:0}};
window.discountAmount = {{vm_pricing.discount_amount|default:0}}; window.discountAmount = {{vm_pricing.discount_amount|default:0}};
window.enable_512mb = {{vm_pricing.enable_512mb|default:false}}; window.minRam = {{min_ram}};
</script> </script>
{% endif %} {% endif %}
@ -55,9 +55,8 @@
<div class="form-group"> <div class="form-group">
<div class="description input"> <div class="description input">
<i class="fa fa-minus-circle left" data-minus="ram" aria-hidden="true"></i> <i class="fa fa-minus-circle left" data-minus="ram" aria-hidden="true"></i>
{% firstof if enable_512mb_ram "0.5" endif "1" as myvar %} <input id="ramValue" class="input-price select-number" type="number" min="{{min_ram}}" max="200" name="ram"
<input id="ramValue" class="input-price select-number" type="number" min="{% if enable_512mb_ram %}0.5{% else %}1{% endif %}" max="200" name="ram" data-error="{% blocktrans with min_ram=min_ram %}Please enter a value in range {{min_ram}} - 200.{% endblocktrans %}" required step="any">
data-error="{% blocktrans %}Please enter a value in range {% if enable_512mb_ram %}0.5{% else %}1{% endif %} - 200.{% endblocktrans %}" required>
<span> GB RAM</span> <span> GB RAM</span>
<i class="fa fa-plus-circle right" data-plus="ram" aria-hidden="true"></i> <i class="fa fa-plus-circle right" data-plus="ram" aria-hidden="true"></i>
</div> </div>