diff --git a/cuchulu/libraries/generate_admin_class.py b/cuchulu/libraries/generate_admin_class.py index 9df0cc8..e130790 100644 --- a/cuchulu/libraries/generate_admin_class.py +++ b/cuchulu/libraries/generate_admin_class.py @@ -105,6 +105,8 @@ class GenerateAdminClass: self.post_update=None self.text_home=_('Home') + + self.edit_forms=OrderedDict() def show(self): """ Method for show the admin model @@ -127,12 +129,12 @@ class GenerateAdminClass: self.model.create_forms() - edit_forms=OrderedDict() + #edit_forms=OrderedDict() url_action=self.url for key_form in self.arr_fields_edit: - edit_forms[key_form]=self.model.forms[key_form] + self.edit_forms[key_form]=self.model.forms[key_form] if getpostfiles.get['op_admin']=='1': @@ -156,7 +158,7 @@ class GenerateAdminClass: url_action=add_get_parameters(self.url, op_admin=2, id=getpostfiles.get['id']) - form=show_form(post, edit_forms, self.t, False, pass_value) + form=show_form(post, self.edit_forms, self.t, False, pass_value) return self.t.render_template(self.template_insert, admin=self, title_edit=title_edit, form=form, model=self.model, id=getpostfiles.get['id'], url_action=url_action, enctype=self.model.enctype) @@ -205,14 +207,14 @@ class GenerateAdminClass: else: url_action=add_get_parameters(self.url, op_admin=2, id=getpostfiles.get['id']) - form=show_form(getpostfiles.post, edit_forms, self.t, True) + form=show_form(getpostfiles.post, self.edit_forms, self.t, True) return self.t.render_template(self.template_insert, admin=self, title_edit=title_edit, form=form, model=self.model, id=getpostfiles.get['id'], url_action=url_action, enctype=self.model.enctype) else: url_action=add_get_parameters(self.url, op_admin=2, id=getpostfiles.get['id']) - form=show_form(getpostfiles.post, edit_forms, self.t, True) + form=show_form(getpostfiles.post, self.edit_forms, self.t, True) return self.t.render_template(self.template_insert, admin=self, title_edit=title_edit, form=form, model=self.model, id=getpostfiles.get['id'], url_action=url_action, enctype=self.model.enctype) pass @@ -308,6 +310,8 @@ class GenerateConfigClass: self.post_update=None self.text_home=_('Home') + + self.edit_forms=OrderedDict() def show(self): """ Method for show the config admin model @@ -328,12 +332,12 @@ class GenerateConfigClass: title_edit=_('Edit')+' '+self.title_name - edit_forms=OrderedDict() + self.edit_forms=OrderedDict() form_values={} for key_form in self.arr_fields_edit: - edit_forms[key_form]=self.model.forms[key_form] + self.edit_forms[key_form]=self.model.forms[key_form] url_action=add_get_parameters(self.url, op_config=1) @@ -362,7 +366,7 @@ class GenerateConfigClass: else: - form=show_form(getpostfiles.post, edit_forms, self.t, True) + form=show_form(getpostfiles.post, self.edit_forms, self.t, True) self.model.yes_reset_conditions=True return self.t.render_template(self.template_insert, admin=self, title_edit=title_edit, form=form, model=self.model, id='0', url_action=url_action, enctype=self.model.enctype) @@ -375,7 +379,7 @@ class GenerateConfigClass: form_values={} pass_values=False - form=show_form(form_values, edit_forms, self.t, True, pass_values) + form=show_form(form_values, self.edit_forms, self.t, True, pass_values) return self.t.render_template(self.template_insert, admin=self, title_edit=title_edit, form=form, model=self.model, id=0, url_action=url_action, enctype=self.model.enctype) diff --git a/pyproject.toml b/pyproject.toml index b21097a..0d08f48 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "flit_core.buildapi" name = "cuchulu" authors = [{name = "Antonio de la Rosa", email = "antonio.delarosa@cuchulu.com"}] readme = "README.md" -version = "1.0.39.4" +version = "1.0.39.5" description = "A simple framework using bottle and mako" # dynamic = ["version", "description"] diff --git a/setup.py b/setup.py index 927d67a..f1c3ae6 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ if sys.version_info < (3, 8): # If you install passlib and bcrypt, the password system will use bcrypt by default, if not, will use native crypt libc setup(name='cuchulu', - version='1.6.0', + version='1.0.39.5', description='Simple Web Framework based in bottlepy and Mako.', long_description='This framework is a simple framework used for create web apps. Cuchulu is modular and fast. By default have a module called admin that can be used for create admin sites', author='Antonio de la Rosa Caballero',