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

Fix bugs

Browse source
This commit is contained in:
PCoder 2019-12-24 17:15:38 +05:30
commit 610dc6ecc1
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
datacenterlight/cms_plugins.py
View file

@ -100,19 +100,19 @@ class DCLCalculatorPlugin(CMSPluginBase):
def render(self, context, instance, placeholder): def render(self, context, instance, placeholder):
clear_all_session_vars(context['request']) clear_all_session_vars(context['request'])
if instance and instance.template: if instance and hasattr(instance, 'template'):
self.render_template = instance.template self.render_template = instance.template
request = context['request']
if self.request.method == "POST" and "order_form" in self.request.POST.keys(): if request.method == "POST" and "order_form" in request.POST.keys():
cores = self.request.POST.get('cpu') cores = request.POST.get('cpu')
cores_field = forms.IntegerField(validators=[self.validate_cores]) 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]) memory_field = forms.FloatField(validators=[self.validate_memory])
storage = self.request.POST.get('storage') storage = request.POST.get('storage')
storage_field = forms.IntegerField( storage_field = forms.IntegerField(
validators=[self.validate_storage]) validators=[self.validate_storage])
template_id = int(self.request.POST.get('config')) template_id = int(request.POST.get('config'))
pricing_name = self.request.POST.get('pricing_name') pricing_name = request.POST.get('pricing_name')
vm_pricing = VMPricing.get_vm_pricing_by_name(pricing_name) vm_pricing = VMPricing.get_vm_pricing_by_name(pricing_name)
template = VMTemplate.objects.filter( template = VMTemplate.objects.filter(
opennebula_vm_template_id=template_id).first() opennebula_vm_template_id=template_id).first()
@ -126,7 +126,7 @@ class DCLCalculatorPlugin(CMSPluginBase):
) )
) )
messages.add_message( messages.add_message(
self.request, messages.ERROR, vm_pricing_name_msg, request, messages.ERROR, vm_pricing_name_msg,
extra_tags='pricing' extra_tags='pricing'
) )
return redirect(self) return redirect(self)
@ -137,7 +137,7 @@ class DCLCalculatorPlugin(CMSPluginBase):
cores = cores_field.clean(cores) cores = cores_field.clean(cores)
except ValidationError as err: except ValidationError as err:
msg = '{} : {}.'.format(cores, str(err)) msg = '{} : {}.'.format(cores, str(err))
messages.add_message(self.request, messages.ERROR, msg, messages.add_message(request, messages.ERROR, msg,
extra_tags='cores') extra_tags='cores')
return redirect(self) return redirect(self)
@ -145,7 +145,7 @@ class DCLCalculatorPlugin(CMSPluginBase):
memory = memory_field.clean(memory) memory = memory_field.clean(memory)
except ValidationError as err: except ValidationError as err:
msg = '{} : {}.'.format(memory, str(err)) msg = '{} : {}.'.format(memory, str(err))
messages.add_message(self.request, messages.ERROR, msg, messages.add_message(request, messages.ERROR, msg,
extra_tags='memory') extra_tags='memory')
return redirect(self) return redirect(self)
@ -153,7 +153,7 @@ class DCLCalculatorPlugin(CMSPluginBase):
storage = storage_field.clean(storage) storage = storage_field.clean(storage)
except ValidationError as err: except ValidationError as err:
msg = '{} : {}.'.format(storage, str(err)) msg = '{} : {}.'.format(storage, str(err))
messages.add_message(self.request, messages.ERROR, msg, messages.add_message(request, messages.ERROR, msg,
extra_tags='storage') extra_tags='storage')
return redirect(self) return redirect(self)
@ -176,8 +176,8 @@ class DCLCalculatorPlugin(CMSPluginBase):
'pricing_name': vm_pricing_name 'pricing_name': vm_pricing_name
} }
self.request.session['specs'] = specs request.session['specs'] = specs
self.request.session['template'] = template_data request.session['template'] = template_data
return redirect(reverse('datacenterlight:payment')) return redirect(reverse('datacenterlight:payment'))
else: else:
context = super(DCLCalculatorPlugin, self).render( context = super(DCLCalculatorPlugin, self).render(
@ -201,14 +201,14 @@ class DCLCalculatorPlugin(CMSPluginBase):
raise ValidationError(_('Invalid number of cores')) raise ValidationError(_('Invalid number of cores'))
def validate_memory(self, value): def validate_memory(self, value):
if 'pid' in self.request.POST: if 'pid' in request.POST:
try: try:
plugin = DCLCalculatorPluginModel.objects.get( plugin = DCLCalculatorPluginModel.objects.get(
id=self.request.POST['pid'] id=request.POST['pid']
) )
except DCLCalculatorPluginModel.DoesNotExist as dne: except DCLCalculatorPluginModel.DoesNotExist as dne:
logger.error( logger.error(
str(dne) + " plugin_id: " + self.request.POST['pid'] str(dne) + " plugin_id: " + request.POST['pid']
) )
raise ValidationError(_('Invalid calculator properties')) raise ValidationError(_('Invalid calculator properties'))
if plugin.enable_512mb_ram: if plugin.enable_512mb_ram: