paramecio/parameciofm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes in errors

Browse source
This commit is contained in:
Antonio de la Rosa 2017-07-05 22:55:12 +02:00
parent eb3d1df89d
commit fd4019069d
3 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
paramecio/cromosoma/extrafields/datefield.py
View file

@ -17,7 +17,9 @@ class DateField(PhangoField):
elif not datetime.obtain_timestamp(value, True): elif not datetime.obtain_timestamp(value, True):
return False self.error=True
self.txt_error='Date format invalid'
return ''
if value==False: if value==False:

34
paramecio/cromosoma/usermodel.py
View file

@ -114,30 +114,24 @@ class UserModel(WebModel):
if self.username_field in dict_values: if self.username_field in dict_values:
self.conditions=['WHERE (username=%s', [dict_values[self.username_field]]] self.conditions=['WHERE username=%s AND '+self.name_field_id+'!=%s', [dict_values[self.username_field], get_id]]
if self.email_field in dict_values:
if len(self.conditions[1])>0:
self.conditions[0]+=' OR email=%s)'
else:
self.conditions[0]='WHERE (email=%s)'
self.conditions[1]=[]
self.conditions[1].append(dict_values[self.email_field])
if get_id>0:
self.conditions[0]+=' AND '+self.name_field_id+'!=%s'
self.conditions[1].append(get_id)
if self.select_count()>0: if self.select_count()>0:
self.fields[self.username_field].error=True self.fields[self.username_field].error=True
self.fields[self.username_field].txt_error=I18n.lang('common', 'error_username_or_password_exists', 'Error: username or email exists in database') self.fields[self.username_field].txt_error=I18n.lang('common', 'error_username_exists', 'Error: username exists in database')
error+=1
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]]
if self.select_count()>0:
self.fields[self.username_field].error=True
self.fields[self.username_field].txt_error=I18n.lang('common', 'error_email_exists', 'Error: email exists in database')
error+=1 error+=1

7
paramecio/cromosoma/webmodel.py
View file

@ -421,7 +421,7 @@ class WebModel:
except: except:
self.query_error='Cannot insert the new row' self.query_error='Cannot insert the new row'
print(sys.exc_info()[0])
return False return False
c=len(values) c=len(values)
@ -1070,8 +1070,13 @@ class WebModel:
#Error, need this fields. #Error, need this fields.
self.num_errors+=1 self.num_errors+=1
if self.fields[k].txt_error=='':
self.fields_errors[k].append("Error: "+v.label+" field required") self.fields_errors[k].append("Error: "+v.label+" field required")
else:
self.fields_errors[k].append(self.fields[k].txt_error)
error=True error=True
else: else: