From 1dca7a3f43759a52e41fcd1c4c9bb115187dae6b Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Tue, 8 Dec 2015 02:43:07 +0100 Subject: [PATCH] Fixes in usermodel --- cromosoma/usermodel.py | 4 +++- cromosoma/webmodel.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cromosoma/usermodel.py b/cromosoma/usermodel.py index 1d06acd..b78555d 100644 --- a/cromosoma/usermodel.py +++ b/cromosoma/usermodel.py @@ -30,6 +30,8 @@ class UserModel(WebModel): repeat_password.label=I18n.lang('common', 'repeat_password', 'Repeat Password') + repeat_password.field=self.fields['password'] + self.create_form_after(self.password_field, repeat_password) """ def insert(self, dict_values, external_agent=True): @@ -116,7 +118,7 @@ class UserModel(WebModel): self.conditions[0]+=' AND '+self.name_field_id+'!=%s' self.conditions[1].append(get_id) - print(self.conditions[0]) + if self.select_count()>0: self.fields[self.username_field].error=True diff --git a/cromosoma/webmodel.py b/cromosoma/webmodel.py index 0c2c53b..8ac6c30 100644 --- a/cromosoma/webmodel.py +++ b/cromosoma/webmodel.py @@ -828,7 +828,7 @@ class PhangoField: value=WebModel.escape_sql(value) if value=="": - self.txt_error="The field is in blank" + self.txt_error="The field is empty" self.error=True