From 7527caed2c64d9494376f93430a2b615bcc96756 Mon Sep 17 00:00:00 2001
From: Antonio de la Rosa <webmaster@web-t-sys.com>
Date: Mon, 13 Jun 2016 04:46:44 +0200
Subject: [PATCH] Fixes in modelforms and formsutils

---
 paramecio/cromosoma/coreforms.py  | 23 +++++++++++++++++++----
 paramecio/cromosoma/formsutils.py |  4 ++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/paramecio/cromosoma/coreforms.py b/paramecio/cromosoma/coreforms.py
index 11d8369..61735e3 100644
--- a/paramecio/cromosoma/coreforms.py
+++ b/paramecio/cromosoma/coreforms.py
@@ -16,10 +16,11 @@ class BaseForm:
         self.field=None
         self.required=False
         self.txt_error=''
+        self.name_field_id=self.name+'_form'
         
     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):
     
@@ -66,14 +67,13 @@ class HiddenForm(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)
         self.arr_select=elements
-        self.default_value=default_value
     
     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'}
         
@@ -90,6 +90,7 @@ class SelectModelForm(SelectForm):
     
     def __init__(self, name, value, model, field_name, field_value, field_parent=None):
         super(SelectModelForm, self).__init__(name, value)
+        self.default_value=int(self.default_value)
         self.arr_select=OrderedDict()
         self.model=model
         self.field_name=field_name
@@ -111,6 +112,13 @@ class SelectModelForm(SelectForm):
         for arr_value in cur:
             
             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()
         
@@ -143,6 +151,13 @@ class SelectModelForm(SelectForm):
         self.model.conditions=old_conditions
         self.model.limit=old_limit
         
+        try:
+        
+            self.default_value=int(self.default_value)
+            
+        except:
+            self.default_value=0
+        
         return super().form()
         
 
diff --git a/paramecio/cromosoma/formsutils.py b/paramecio/cromosoma/formsutils.py
index 8750813..26f71a5 100644
--- a/paramecio/cromosoma/formsutils.py
+++ b/paramecio/cromosoma/formsutils.py
@@ -15,8 +15,8 @@ def pass_values_to_form(post, arr_form, yes_error=True):
         
         post[key]=post.get(key, '')
         
-        if arr_form[key].default_value=='':
-            arr_form[key].default_value=post[key]
+        #if arr_form[key].default_value=='':
+        arr_form[key].default_value=post[key]
         
         if arr_form[key].field==None:
            arr_form[key].field=corefields.CharField(key, 255, required=False)