Fix bugs
This commit is contained in:
parent
ff07cab96c
commit
610dc6ecc1
1 changed files with 17 additions and 17 deletions
|
|
@ -100,19 +100,19 @@ class DCLCalculatorPlugin(CMSPluginBase):
|
|||
def render(self, context, instance, placeholder):
|
||||
clear_all_session_vars(context['request'])
|
||||
|
||||
if instance and instance.template:
|
||||
if instance and hasattr(instance, 'template'):
|
||||
self.render_template = instance.template
|
||||
|
||||
if self.request.method == "POST" and "order_form" in self.request.POST.keys():
|
||||
cores = self.request.POST.get('cpu')
|
||||
request = context['request']
|
||||
if request.method == "POST" and "order_form" in request.POST.keys():
|
||||
cores = request.POST.get('cpu')
|
||||
cores_field = forms.IntegerField(validators=[self.validate_cores])
|
||||
memory = self.request.POST.get('ram')
|
||||
memory = request.POST.get('ram')
|
||||
memory_field = forms.FloatField(validators=[self.validate_memory])
|
||||
storage = self.request.POST.get('storage')
|
||||
storage = request.POST.get('storage')
|
||||
storage_field = forms.IntegerField(
|
||||
validators=[self.validate_storage])
|
||||
template_id = int(self.request.POST.get('config'))
|
||||
pricing_name = self.request.POST.get('pricing_name')
|
||||
template_id = int(request.POST.get('config'))
|
||||
pricing_name = request.POST.get('pricing_name')
|
||||
vm_pricing = VMPricing.get_vm_pricing_by_name(pricing_name)
|
||||
template = VMTemplate.objects.filter(
|
||||
opennebula_vm_template_id=template_id).first()
|
||||
|
|
@ -126,7 +126,7 @@ class DCLCalculatorPlugin(CMSPluginBase):
|
|||
)
|
||||
)
|
||||
messages.add_message(
|
||||
self.request, messages.ERROR, vm_pricing_name_msg,
|
||||
request, messages.ERROR, vm_pricing_name_msg,
|
||||
extra_tags='pricing'
|
||||
)
|
||||
return redirect(self)
|
||||
|
|
@ -137,7 +137,7 @@ class DCLCalculatorPlugin(CMSPluginBase):
|
|||
cores = cores_field.clean(cores)
|
||||
except ValidationError as err:
|
||||
msg = '{} : {}.'.format(cores, str(err))
|
||||
messages.add_message(self.request, messages.ERROR, msg,
|
||||
messages.add_message(request, messages.ERROR, msg,
|
||||
extra_tags='cores')
|
||||
return redirect(self)
|
||||
|
||||
|
|
@ -145,7 +145,7 @@ class DCLCalculatorPlugin(CMSPluginBase):
|
|||
memory = memory_field.clean(memory)
|
||||
except ValidationError as err:
|
||||
msg = '{} : {}.'.format(memory, str(err))
|
||||
messages.add_message(self.request, messages.ERROR, msg,
|
||||
messages.add_message(request, messages.ERROR, msg,
|
||||
extra_tags='memory')
|
||||
return redirect(self)
|
||||
|
||||
|
|
@ -153,7 +153,7 @@ class DCLCalculatorPlugin(CMSPluginBase):
|
|||
storage = storage_field.clean(storage)
|
||||
except ValidationError as err:
|
||||
msg = '{} : {}.'.format(storage, str(err))
|
||||
messages.add_message(self.request, messages.ERROR, msg,
|
||||
messages.add_message(request, messages.ERROR, msg,
|
||||
extra_tags='storage')
|
||||
return redirect(self)
|
||||
|
||||
|
|
@ -176,8 +176,8 @@ class DCLCalculatorPlugin(CMSPluginBase):
|
|||
'pricing_name': vm_pricing_name
|
||||
}
|
||||
|
||||
self.request.session['specs'] = specs
|
||||
self.request.session['template'] = template_data
|
||||
request.session['specs'] = specs
|
||||
request.session['template'] = template_data
|
||||
return redirect(reverse('datacenterlight:payment'))
|
||||
else:
|
||||
context = super(DCLCalculatorPlugin, self).render(
|
||||
|
|
@ -201,14 +201,14 @@ class DCLCalculatorPlugin(CMSPluginBase):
|
|||
raise ValidationError(_('Invalid number of cores'))
|
||||
|
||||
def validate_memory(self, value):
|
||||
if 'pid' in self.request.POST:
|
||||
if 'pid' in request.POST:
|
||||
try:
|
||||
plugin = DCLCalculatorPluginModel.objects.get(
|
||||
id=self.request.POST['pid']
|
||||
id=request.POST['pid']
|
||||
)
|
||||
except DCLCalculatorPluginModel.DoesNotExist as dne:
|
||||
logger.error(
|
||||
str(dne) + " plugin_id: " + self.request.POST['pid']
|
||||
str(dne) + " plugin_id: " + request.POST['pid']
|
||||
)
|
||||
raise ValidationError(_('Invalid calculator properties'))
|
||||
if plugin.enable_512mb_ram:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue