paramecio/parameciofm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes in modelforms and formsutils

Browse source
This commit is contained in:
Antonio de la Rosa 2016-06-13 04:46:44 +02:00
parent b58f734064
commit 7527caed2c
2 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
paramecio/cromosoma/coreforms.py
View file

@ -16,10 +16,11 @@ class BaseForm:
self.field=None self.field=None
self.required=False self.required=False
self.txt_error='' self.txt_error=''
self.name_field_id=self.name+'_form'
def form(self): def form(self):
return '<input type="'+self.type+'" class="'+self.css+'" name="'+self.name+'" id="'+self.name+'_form" value="'+self.setform(self.default_value)+'">' return '<input type="'+self.type+'" class="'+self.css+'" name="'+self.name+'" id="'+self.name_field_id+'" value="'+self.setform(self.default_value)+'">'
def show_formatted(self, value): def show_formatted(self, value):
@ -66,14 +67,13 @@ class HiddenForm(BaseForm):
class SelectForm(BaseForm): class SelectForm(BaseForm):
def __init__(self, name, value, elements=OrderedDict(), default_value=""): def __init__(self, name, value, elements=OrderedDict()):
super(SelectForm, self).__init__(name, value) super(SelectForm, self).__init__(name, value)
self.arr_select=elements self.arr_select=elements
self.default_value=default_value
def form(self): def form(self):
the_form='<select name="'+self.name+'">\n' the_form='<select name="'+self.name+'" id="'+self.name_field_id+'">\n'
arr_selected={self.default_value: 'selected'} arr_selected={self.default_value: 'selected'}
@ -90,6 +90,7 @@ class SelectModelForm(SelectForm):
def __init__(self, name, value, model, field_name, field_value, field_parent=None): def __init__(self, name, value, model, field_name, field_value, field_parent=None):
super(SelectModelForm, self).__init__(name, value) super(SelectModelForm, self).__init__(name, value)
self.default_value=int(self.default_value)
self.arr_select=OrderedDict() self.arr_select=OrderedDict()
self.model=model self.model=model
self.field_name=field_name self.field_name=field_name
@ -112,6 +113,13 @@ class SelectModelForm(SelectForm):
self.arr_select[arr_value[self.field_value]]=arr_value[self.field_name] self.arr_select[arr_value[self.field_value]]=arr_value[self.field_name]
try:
self.default_value=int(self.default_value)
except:
self.default_value=0
return super().form() return super().form()
def parent_form(self): def parent_form(self):
@ -143,6 +151,13 @@ class SelectModelForm(SelectForm):
self.model.conditions=old_conditions self.model.conditions=old_conditions
self.model.limit=old_limit self.model.limit=old_limit
try:
self.default_value=int(self.default_value)
except:
self.default_value=0
return super().form() return super().form()

2
paramecio/cromosoma/formsutils.py
View file

@ -15,7 +15,7 @@ def pass_values_to_form(post, arr_form, yes_error=True):
post[key]=post.get(key, '') post[key]=post.get(key, '')
if arr_form[key].default_value=='': #if arr_form[key].default_value=='':
arr_form[key].default_value=post[key] arr_form[key].default_value=post[key]
if arr_form[key].field==None: if arr_form[key].field==None: