Fixes in models

This commit is contained in:
Antonio de la Rosa 2021-08-11 18:50:33 +02:00
parent 8e05927a32
commit 3529f36900
3 changed files with 11 additions and 6 deletions

View file

@ -3,7 +3,7 @@
from importlib import import_module from importlib import import_module
#from paramecio.citoplasma.sessions import get_session #from paramecio.citoplasma.sessions import get_session
import json import json
from flask import session from flask import session, has_request_context
yes_session=False yes_session=False
@ -45,7 +45,8 @@ class I18n:
lang=I18n.default_lang lang=I18n.default_lang
#lang=session.get('lang', lang) if has_request_context():
lang=session.get('lang', lang)
return lang return lang

View file

@ -244,11 +244,14 @@ class AjaxList(SimpleList):
self.db=db self.db=db
self.func_fields={} self.func_fields={}
self.initial_order_field=''
self.initial_order=0
def show(self): def show(self):
begin_page=int(get_post_args('position', 0)) begin_page=int(get_post_args('position', 0))
order_field=get_post_args('order_field', '') order_field=get_post_args('order_field', self.initial_order_field)
order=get_post_args('order', 0) order=get_post_args('order', self.initial_order)
limit=self.limit limit=self.limit
arr_order=['ASC', 'DESC'] arr_order=['ASC', 'DESC']

View file

@ -20,7 +20,7 @@ class PrivilegesField(corefields.IntegerField):
return I18n.lang('admin', 'selected_privileges', 'Selected privileges') return I18n.lang('admin', 'selected_privileges', 'Selected privileges')
elif value==2: elif value==2:
return I18n.lang('admin', 'administrator', 'Administrator') return I18n.lang('admin', 'administrator', 'Administrator')
"""
_username=corefields.CharField('username') _username=corefields.CharField('username')
_password=PasswordField('password') _password=PasswordField('password')
_email=EmailField('email') _email=EmailField('email')
@ -30,6 +30,7 @@ _privileges=PrivilegesField('privileges')
_lang=LangField('lang', 20) _lang=LangField('lang', 20)
_disabled=corefields.BooleanField('disabled') _disabled=corefields.BooleanField('disabled')
_num_tries=corefields.IntegerField('num_tries', 1) _num_tries=corefields.IntegerField('num_tries', 1)
"""
class UserAdmin(UserModel): class UserAdmin(UserModel):