From 6f9931edca399f1e4e8a4f1028fc96cbd62ee8b1 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Fri, 15 Apr 2016 22:27:01 +0200 Subject: [PATCH] Little bug fixes --- paramecio/citoplasma/generate_admin_class.py | 6 +++--- paramecio/citoplasma/httputils.py | 2 +- paramecio/cromosoma/usermodel.py | 4 ++-- paramecio/cromosoma/webmodel.py | 4 +++- paramecio/modules/admin/admin/ausers.py | 4 +--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/paramecio/citoplasma/generate_admin_class.py b/paramecio/citoplasma/generate_admin_class.py index 045ad8c..0048f77 100644 --- a/paramecio/citoplasma/generate_admin_class.py +++ b/paramecio/citoplasma/generate_admin_class.py @@ -85,7 +85,7 @@ class GenerateAdminClass: GetPostFiles.obtain_post() - post=GetPostFiles.post + #post=GetPostFiles.post self.model.reset_conditions() @@ -107,12 +107,12 @@ class GenerateAdminClass: title_edit=I18n.lang('common', 'edit_new_item', 'Edit item') self.model.conditions=['WHERE `'+self.model.name+'`.`'+self.model.name_field_id+'`=%s', [GetPostFiles.get['id']]] - if insert_row(post): + if insert_row(GetPostFiles.post): set_flash_message(I18n.lang('common', 'task_successful', 'Task successful')) redirect(self.url) else: - form=show_form(post, edit_forms, self.t, True) + form=show_form(GetPostFiles.post, edit_forms, self.t, True) return self.t.load_template(self.template_insert, admin=self, title_edit=title_edit, form=form, model=self.model, id=GetPostFiles.get['id']) diff --git a/paramecio/citoplasma/httputils.py b/paramecio/citoplasma/httputils.py index bfd71f4..b27a29e 100644 --- a/paramecio/citoplasma/httputils.py +++ b/paramecio/citoplasma/httputils.py @@ -30,7 +30,7 @@ class GetPostFiles: for post in required_post: GetPostFiles.post[post]=GetPostFiles.post.get(post, '') - + s=get_session() if 'csrf_token' in s: diff --git a/paramecio/cromosoma/usermodel.py b/paramecio/cromosoma/usermodel.py index da5f536..bc71dc1 100644 --- a/paramecio/cromosoma/usermodel.py +++ b/paramecio/cromosoma/usermodel.py @@ -85,8 +85,8 @@ class UserModel(WebModel): if self.updated: # Need the id - GetPostFiles.obtain_get() - GetPostFiles.obtain_post() + #GetPostFiles.obtain_get() + #GetPostFiles.obtain_post() get_id=GetPostFiles.get.get(self.name_field_id, '0') diff --git a/paramecio/cromosoma/webmodel.py b/paramecio/cromosoma/webmodel.py index c38dc13..ada783b 100644 --- a/paramecio/cromosoma/webmodel.py +++ b/paramecio/cromosoma/webmodel.py @@ -834,7 +834,9 @@ class WebModel: for type_error in self.errors.values(): for error in type_error: error_txt+=error+"\n" - + + error_txt=self.query_error+"\n" + return error_txt @staticmethod diff --git a/paramecio/modules/admin/admin/ausers.py b/paramecio/modules/admin/admin/ausers.py index 29543e5..55cb290 100644 --- a/paramecio/modules/admin/admin/ausers.py +++ b/paramecio/modules/admin/admin/ausers.py @@ -15,7 +15,7 @@ def admin(t): user_admin.create_forms(['username', 'password', 'email', 'privileges', 'lang']) - user_admin.forms['privileges'].arr_select={0: I18n.lang('admin', 'without_privileges', 'Without privileges'), 1: I18n.lang('admin', 'selected_privileges', 'Selected privileges'), 2: I18n.lang('admin', 'administrator', 'Administrator')} + user_admin.forms['privileges'].arr_select={'0': I18n.lang('admin', 'without_privileges', 'Without privileges'), '1': I18n.lang('admin', 'selected_privileges', 'Selected privileges'), '2': I18n.lang('admin', 'administrator', 'Administrator')} user_admin.fields['password'].protected=False @@ -33,6 +33,4 @@ def admin(t): form_admin=admin.show() - print(user_admin.show_errors()) - return form_admin