From 693c6754e1f5304da9227265052a0e070fc422a7 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Mon, 1 May 2017 00:27:38 +0200 Subject: [PATCH] Fixes in database functions and i18n fields --- paramecio/citoplasma/i18n.py | 4 ++-- paramecio/cromosoma/databases/mysqldb.py | 2 ++ paramecio/cromosoma/extrafields/i18nfield.py | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/paramecio/citoplasma/i18n.py b/paramecio/citoplasma/i18n.py index bf1b018..814f62a 100644 --- a/paramecio/citoplasma/i18n.py +++ b/paramecio/citoplasma/i18n.py @@ -43,9 +43,9 @@ class I18n: lang=I18n.default_lang - #s=get_session() + s=get_session() - #lang=s.get('lang', lang) + lang=s.get('lang', lang) return lang diff --git a/paramecio/cromosoma/databases/mysqldb.py b/paramecio/cromosoma/databases/mysqldb.py index d85963e..893e647 100644 --- a/paramecio/cromosoma/databases/mysqldb.py +++ b/paramecio/cromosoma/databases/mysqldb.py @@ -47,6 +47,8 @@ class SqlClass: self.error_connection="Error in connection: %s %s" % (e, v) + self.conn.close() + raise NameError(self.error_connection) diff --git a/paramecio/cromosoma/extrafields/i18nfield.py b/paramecio/cromosoma/extrafields/i18nfield.py index 0f5981d..d02b2e3 100644 --- a/paramecio/cromosoma/extrafields/i18nfield.py +++ b/paramecio/cromosoma/extrafields/i18nfield.py @@ -72,7 +72,23 @@ class I18nField(PhangoField): return "" #GetPostFiles.post.get(self.name+'_'+lang, '') + def show_formatted(self, value): + + value=json.loads(value) + + lang=I18n.get_default_lang() + + return value[lang] + @staticmethod + def get_value(value): + + value=json.loads(value) + + lang=I18n.get_default_lang() + + return value[lang] + class I18nHTMLField(I18nField): def check_value(self, value):