From db23fb230b3fdc3ea5cb12e893c70d4e4ce3831e Mon Sep 17 00:00:00 2001 From: absurdo Date: Mon, 3 Apr 2023 01:20:54 +0200 Subject: [PATCH] Fixes in usermodel, fixed errors in webmodel, fixes in lists documentation --- paramecio2/libraries/db/usermodel.py | 6 +++--- paramecio2/libraries/db/webmodel.py | 4 ++-- paramecio2/libraries/lists.py | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/paramecio2/libraries/db/usermodel.py b/paramecio2/libraries/db/usermodel.py index bd9b334..1708951 100644 --- a/paramecio2/libraries/db/usermodel.py +++ b/paramecio2/libraries/db/usermodel.py @@ -48,7 +48,7 @@ class UserModel(WebModel): repeat_password.label=I18n.lang('common', 'repeat_password', 'Repeat Password') - repeat_password.field=self.fields['password'] + repeat_password.field=self.fields[self.password_field] self.create_form_after(self.password_field, repeat_password) @@ -141,7 +141,7 @@ class UserModel(WebModel): if self.username_field in dict_values: - self.conditions=['WHERE username=%s AND '+self.name_field_id+'!=%s', [dict_values[self.username_field], get_id]] + self.conditions=['WHERE '+self.username_field+'=%s AND '+self.name_field_id+'!=%s', [dict_values[self.username_field], get_id]] if self.select_count()>0: @@ -155,7 +155,7 @@ class UserModel(WebModel): if self.email_field in dict_values: - self.conditions=['WHERE email=%s AND '+self.name_field_id+'!=%s', [dict_values[self.email_field], get_id]] + self.conditions=['WHERE '+self.email_field+'=%s AND '+self.name_field_id+'!=%s', [dict_values[self.email_field], get_id]] if self.select_count()>0: diff --git a/paramecio2/libraries/db/webmodel.py b/paramecio2/libraries/db/webmodel.py index 64610f7..8a904b1 100644 --- a/paramecio2/libraries/db/webmodel.py +++ b/paramecio2/libraries/db/webmodel.py @@ -609,8 +609,8 @@ class WebModel: else: return False - except: - self.query_error='Cannot insert the new row '+sys.exc_info()[0] + except Exception as e: + self.query_error='Cannot insert the new row '+str(e) #print(sys.exc_info()[0]) return False diff --git a/paramecio2/libraries/lists.py b/paramecio2/libraries/lists.py index d17ceb6..ad82fae 100644 --- a/paramecio2/libraries/lists.py +++ b/paramecio2/libraries/lists.py @@ -25,9 +25,9 @@ class SimpleList: Attributes: raw_query (boolean): If True then raw query is done, if False then query with all related fields is done t (PTemplate): Template used for the class. Normally template subclassed from admin_t PTemplate - model (WebModel) The webmodel used for generate the admin model form - fields (list) A list with fields names of model getting of db query - fields_showed (list) A list with fields names of model showed in list + model (WebModel): The webmodel used for generate the admin model form + fields (list): A list with fields names of model getting of db query + fields_showed (list): A list with fields names of model showed in list url (str): Base url used by SimpleList for generate edit, insert and other urls. limit_pages (int): The number of items by page. By default, 20 items order_defaults (list): Internal list used for define Ascendent and Descendent in sql queries