From f702f604c798f13ac00106821034b7f6f5a48dc3 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Fri, 2 Mar 2018 17:52:17 +0100 Subject: [PATCH] Fixes in sqlalchemy interface --- paramecio/citoplasma/generate_admin_class.py | 14 ++++++++++++++ paramecio/citoplasma/sessions.py | 1 + paramecio/cromosoma/databases/sqlalchemy.py | 2 +- paramecio/cromosoma/webmodel.py | 2 ++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/paramecio/citoplasma/generate_admin_class.py b/paramecio/citoplasma/generate_admin_class.py index 2680194..d1c3da3 100644 --- a/paramecio/citoplasma/generate_admin_class.py +++ b/paramecio/citoplasma/generate_admin_class.py @@ -48,6 +48,8 @@ class GenerateAdminClass: self.template_verify_delete='utils/verify_delete.phtml' self.url_redirect=self.url + + self.post_update=None def show(self): @@ -124,6 +126,10 @@ class GenerateAdminClass: if insert_row(getpostfiles.post): set_flash_message(I18n.lang('common', 'task_successful', 'Task successful')) + + if self.post_update: + self.post_update(self, getpostfiles.get['id']) + redirect(self.url) else: url_action=add_get_parameters(self.url, op_admin=2, id=getpostfiles.get['id']) @@ -199,6 +205,8 @@ class GenerateConfigClass: self.template_insert='utils/insertform.phtml' + self.post_update=None + def show(self): getpostfiles=GetPostFiles() @@ -238,7 +246,13 @@ class GenerateConfigClass: if insert_model(getpostfiles.post): set_flash_message(I18n.lang('common', 'task_successful', 'Task successful')) self.model.yes_reset_conditions=True + + if self.post_update: + self.post_update(self) + redirect(self.url_redirect) + + else: form=show_form(getpostfiles.post, edit_forms, self.t, True) diff --git a/paramecio/citoplasma/sessions.py b/paramecio/citoplasma/sessions.py index 83b7c71..cd9d875 100644 --- a/paramecio/citoplasma/sessions.py +++ b/paramecio/citoplasma/sessions.py @@ -334,6 +334,7 @@ else: try: s=json.loads(f.read()) + os.utime(file_session) except: diff --git a/paramecio/cromosoma/databases/sqlalchemy.py b/paramecio/cromosoma/databases/sqlalchemy.py index b111688..5145362 100644 --- a/paramecio/cromosoma/databases/sqlalchemy.py +++ b/paramecio/cromosoma/databases/sqlalchemy.py @@ -45,7 +45,7 @@ class SqlClass: import MySQLdb.cursors SqlClass.cursors_connect=MySQLdb.cursors.DictCursor - engine=create_engine("mysql+%s://%s:%s@%s/%s?charset=utf8mb4" % (self.connection['db_type'], self.connection['user'], self.connection['password'], self.connection['host'], self.connection['db'])) + engine=create_engine("mysql+%s://%s:%s@%s/%s?charset=utf8mb4" % (self.connection['db_type'], self.connection['user'], self.connection['password'], self.connection['host'], self.connection['db']), pool_recycle=3600, echo_pool=True) except: e = sys.exc_info()[0] diff --git a/paramecio/cromosoma/webmodel.py b/paramecio/cromosoma/webmodel.py index a7be2d3..d212594 100644 --- a/paramecio/cromosoma/webmodel.py +++ b/paramecio/cromosoma/webmodel.py @@ -944,6 +944,8 @@ class WebModel: sql_limit+=', '+str(limit[1]) self.limit='limit '+sql_limit + + return self # Method for create sql tables