Fixes
This commit is contained in:
parent
8240e3039d
commit
651613b644
5 changed files with 86 additions and 88 deletions
|
|
@ -73,7 +73,7 @@ class ImageField(CharField):
|
|||
#if not change
|
||||
|
||||
if field_file in files_uploaded:
|
||||
|
||||
|
||||
if files_uploaded[field_file].filename=='':
|
||||
|
||||
if value=='':
|
||||
|
|
@ -113,9 +113,14 @@ class ImageField(CharField):
|
|||
return self.save_folder+'/'+value
|
||||
else:
|
||||
|
||||
value=os.path.basename(value)
|
||||
self.txt_error='Field is empty'
|
||||
self.error=True
|
||||
|
||||
return ''
|
||||
|
||||
#value=os.path.basename(value)
|
||||
|
||||
return self.save_folder+'/'+value
|
||||
#return self.save_folder+'/'+value
|
||||
|
||||
# Load image file
|
||||
|
||||
|
|
|
|||
|
|
@ -1127,7 +1127,9 @@ class WebModel:
|
|||
|
||||
#Need delete rows from other related tables save in self.related_models_deleted
|
||||
|
||||
sql=("delete from `"+self.name+"` "+self.conditions[0]+' '+self.order_by+' '+self.limit).strip()
|
||||
#+' '+self.order_by+' '+self.limit
|
||||
|
||||
sql=("delete from `"+self.name+"` "+self.conditions[0]).strip()
|
||||
|
||||
result=self.query(sql, self.conditions[1], self.connection_id)
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,11 @@ from paramecio2.libraries.formsutils import check_csrf
|
|||
|
||||
#_=pgettext(__file__)
|
||||
|
||||
login_tries=5
|
||||
|
||||
if hasattr(config, 'login_tries'):
|
||||
login_tries=config.login_tries
|
||||
|
||||
gtext=PGetText(__file__)
|
||||
|
||||
_=gtext.gettext
|
||||
|
|
@ -211,7 +216,7 @@ def login():
|
|||
|
||||
arr_user=user_admin.set_conditions('WHERE username=%s', [username]).select_a_row_where()
|
||||
|
||||
if arr_user:
|
||||
if arr_user and not check_login_tries():
|
||||
|
||||
if user_admin.fields['password'].verify(password, arr_user['password']):
|
||||
|
||||
|
|
@ -450,7 +455,7 @@ def check_login_tries():
|
|||
|
||||
if arr_try:
|
||||
|
||||
if arr_try['num_tries']<5:
|
||||
if arr_try['num_tries']<login_tries:
|
||||
|
||||
logintries.query('update logintries set num_tries=num_tries+1, last_login=%s WHERE ip=%s', [date_now, ip])
|
||||
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@
|
|||
% if yes_recovery_login:
|
||||
<div class="form"><a href="${url_for('.recovery_password')}">${_('Recovery password?')}</a></div>
|
||||
% endif
|
||||
<div class="form">${_('Remember that only have 3 attempts')}</div>
|
||||
<!--<div class="form">${_('Remember that only have 3 attempts')}</div>-->
|
||||
</form>
|
||||
</%block>
|
||||
</body>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue