Fixes in generate config and coreforms

This commit is contained in:
Antonio de la Rosa 2017-07-28 04:25:08 +02:00
parent d600d2d31c
commit 528a99eb6d
3 changed files with 15 additions and 5 deletions

View file

@ -47,6 +47,8 @@ class GenerateAdminClass:
self.template_verify_delete='utils/verify_delete.phtml' self.template_verify_delete='utils/verify_delete.phtml'
self.url_redirect=self.url
def show(self): def show(self):
getpostfiles=GetPostFiles() getpostfiles=GetPostFiles()
@ -189,6 +191,8 @@ class GenerateConfigClass:
self.url=url self.url=url
self.url_redirect=self.url
self.arr_fields_edit=list(model.fields.keys()) self.arr_fields_edit=list(model.fields.keys())
del self.arr_fields_edit[self.arr_fields_edit.index(model.name_field_id)] del self.arr_fields_edit[self.arr_fields_edit.index(model.name_field_id)]
@ -220,6 +224,8 @@ class GenerateConfigClass:
if getpostfiles.query['op_config']=='1': if getpostfiles.query['op_config']=='1':
self.model.yes_reset_conditions=False
getpostfiles.obtain_post() getpostfiles.obtain_post()
c=self.model.select_count() c=self.model.select_count()
@ -231,20 +237,24 @@ class GenerateConfigClass:
if insert_model(getpostfiles.post): if insert_model(getpostfiles.post):
set_flash_message(I18n.lang('common', 'task_successful', 'Task successful')) set_flash_message(I18n.lang('common', 'task_successful', 'Task successful'))
redirect(self.url) self.model.yes_reset_conditions=True
redirect(self.url_redirect)
else: else:
form=show_form(getpostfiles.post, edit_forms, self.t, True) form=show_form(getpostfiles.post, 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) 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)
else: else:
form_values=self.model.select_a_row_where() form_values=self.model.select_a_row_where()
pass_values=True
if not form_values: if not form_values:
form_values={} form_values={}
pass_values=False
form=show_form(form_values, edit_forms, self.t, True) form=show_form(form_values, 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) 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)

View file

@ -1,4 +1,4 @@
<p><a href="${admin.url}">${lang('common', 'home', 'Home')}</a> &gt;&gt; \ <p><a href="${admin.url_redirect}">${lang('common', 'home', 'Home')}</a> &gt;&gt; \
% if id!='0': % if id!='0':
${title_edit} \ ${title_edit} \
%else: %else:

View file

@ -20,7 +20,7 @@ class BaseForm:
def form(self): def form(self):
return '<input type="'+self.type+'" class="'+self.css+'" name="'+self.name+'" id="'+self.name_field_id+'" 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):