Fix in foreignkeyfield, sessions and more
This commit is contained in:
parent
2f8a58d0f5
commit
e23bd6cf37
5 changed files with 23 additions and 6 deletions
|
|
@ -42,11 +42,9 @@ class I18n:
|
||||||
|
|
||||||
if s==None:
|
if s==None:
|
||||||
|
|
||||||
s={}
|
s={'lang': lang}
|
||||||
|
|
||||||
s['lang']=s.get('lang', I18n.default_lang)
|
lang=s.get('lang', lang)
|
||||||
|
|
||||||
lang=s['lang']
|
|
||||||
|
|
||||||
return lang
|
return lang
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -104,6 +104,15 @@ class ForeignKeyField(IntegerField):
|
||||||
|
|
||||||
self.change_form(coreforms.SelectModelForm, [related_table, self.named_field, self.identifier_field])
|
self.change_form(coreforms.SelectModelForm, [related_table, self.named_field, self.identifier_field])
|
||||||
|
|
||||||
|
def check(self, value):
|
||||||
|
|
||||||
|
value=super().check(value)
|
||||||
|
|
||||||
|
if value=='0' or value==0:
|
||||||
|
value='NULL'
|
||||||
|
|
||||||
|
return value
|
||||||
|
|
||||||
def get_type_sql(self):
|
def get_type_sql(self):
|
||||||
|
|
||||||
return 'INT NULL'
|
return 'INT NULL'
|
||||||
|
|
|
||||||
|
|
@ -45,6 +45,10 @@ else:
|
||||||
pass
|
pass
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
def print_cookie():
|
||||||
|
pass
|
||||||
|
#print(request.cookies)
|
||||||
|
|
||||||
routes={}
|
routes={}
|
||||||
|
|
||||||
module_loaded=None
|
module_loaded=None
|
||||||
|
|
@ -113,6 +117,8 @@ if config.ssl==True:
|
||||||
|
|
||||||
app = application = default_app()
|
app = application = default_app()
|
||||||
|
|
||||||
|
app.add_hook('before_request', print_cookie)
|
||||||
|
|
||||||
if config.session_enabled==True:
|
if config.session_enabled==True:
|
||||||
#Create dir for sessions
|
#Create dir for sessions
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,8 @@ def home(module='', submodule=''):
|
||||||
|
|
||||||
if s['lang']!=None:
|
if s['lang']!=None:
|
||||||
lang_selected=s['lang']
|
lang_selected=s['lang']
|
||||||
|
else:
|
||||||
|
s['lang']=I18n.default_lang
|
||||||
|
|
||||||
user_admin.conditions=['WHERE id=%s', [s['id']]]
|
user_admin.conditions=['WHERE id=%s', [s['id']]]
|
||||||
|
|
||||||
|
|
@ -235,7 +237,7 @@ def login():
|
||||||
response.set_cookie('remember_login', random_text, expires=timestamp, secret=key_encrypt)
|
response.set_cookie('remember_login', random_text, expires=timestamp, secret=key_encrypt)
|
||||||
#else:
|
#else:
|
||||||
#print(user_admin.query_error)
|
#print(user_admin.query_error)
|
||||||
|
s.save()
|
||||||
|
|
||||||
return {'error': 0}
|
return {'error': 0}
|
||||||
else:
|
else:
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,8 @@ def index(lang):
|
||||||
|
|
||||||
s['lang']=lang
|
s['lang']=lang
|
||||||
|
|
||||||
|
s.save()
|
||||||
|
|
||||||
redirect_url=request.headers.get('Referer')
|
redirect_url=request.headers.get('Referer')
|
||||||
|
|
||||||
if redirect_url!=None:
|
if redirect_url!=None:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue