diff --git a/paramecio/libraries/generate_admin_class.py b/paramecio/libraries/generate_admin_class.py index 4f8ee4e..8c67357 100644 --- a/paramecio/libraries/generate_admin_class.py +++ b/paramecio/libraries/generate_admin_class.py @@ -84,13 +84,13 @@ class GenerateAdminClass: post=None - title_edit=I18n.lang('common', 'add_new_item', 'Add new item') + title_edit=_('Add new item') pass_value=False if getpostfiles.get['id']!='0': post=self.model.select_a_row(getpostfiles.get['id'], [], True) - title_edit=I18n.lang('common', 'edit_new_item', 'Edit item') + title_edit=_('Edit item') pass_value=True if post==None or post==False: @@ -124,19 +124,19 @@ class GenerateAdminClass: getpostfiles.get['id']='0' - title_edit=I18n.lang('common', 'add_new_item', 'Add new item') + title_edit=_('Add new item') if getpostfiles.get['id']!='0': insert_row=self.model.update - title_edit=I18n.lang('common', 'edit_new_item', 'Edit item') + title_edit=_('Edit item') self.model.conditions=['WHERE `'+self.model.name+'`.`'+self.model.name_field_id+'`=%s', [getpostfiles.get['id']]] if self.pre_update: getpostfiles.post=self.pre_update(self, getpostfiles.post) if insert_row(getpostfiles.post): - set_flash_message(I18n.lang('common', 'task_successful', 'Task successful')) + set_flash_message(_('Task successful')) if self.post_update: if getpostfiles.get['id']=='0': @@ -162,7 +162,7 @@ class GenerateAdminClass: if getpostfiles.get['id']!='0': self.model.conditions=['WHERE `'+self.model.name+'`.`'+self.model.name_field_id+'`=%s', [getpostfiles.get['id']]] self.model.delete() - set_flash_message(I18n.lang('common', 'task_successful', 'Task successful')) + set_flash_message(_('Task successful')) redirect(self.url_redirect) else: @@ -261,7 +261,7 @@ class GenerateConfigClass: insert_model=self.model.update if insert_model(getpostfiles.post): - set_flash_message(I18n.lang('common', 'task_successful', 'Task successful')) + set_flash_message(_('Task successful')) self.model.yes_reset_conditions=True if self.post_update: diff --git a/paramecio/libraries/mtemplates.py b/paramecio/libraries/mtemplates.py index 05f9e96..98e2040 100644 --- a/paramecio/libraries/mtemplates.py +++ b/paramecio/libraries/mtemplates.py @@ -462,7 +462,7 @@ def set_flash_message(message): s['flash']=message - #s.save() + s.save() def qf(text): diff --git a/paramecio/modules/admin2/app.py b/paramecio/modules/admin2/app.py index b1d1ce4..4e625e0 100644 --- a/paramecio/modules/admin2/app.py +++ b/paramecio/modules/admin2/app.py @@ -189,15 +189,15 @@ def check_login_admin(session={}): with db.query('select module from privilegesmodule2 WHERE user_id=%s', [result['id']]) as cursor: modules_priv=[v['module'] for v in cursor.fetchall()] - for v in modules_admin: - if v[0] in modules_priv: + for k, v in modules_admin.items(): + if k in modules_priv: if len(v)>2: modules_priv+=v[2] else: modules_priv=[] - for v in modules_admin: - modules_priv.append(v[0]) + for k, v in modules_admin.items(): + modules_priv.append(k) if len(v)==3: modules_priv+=v[2] diff --git a/paramecio/modules/admin2/ausers.py b/paramecio/modules/admin2/ausers.py index 1e078b9..637ca47 100644 --- a/paramecio/modules/admin2/ausers.py +++ b/paramecio/modules/admin2/ausers.py @@ -113,7 +113,14 @@ def admin_permissions(user_id, session={}): priv.fields['module'].name_form=SelectForm - arr_modules={k:v[0] for k, v in modules_admin.items()} + #arr_modules={k:v[0] for k, v in modules_admin.items()} + arr_modules={} + + for k, v in modules_admin.items(): + if type(v[0]).__name__=='function': + arr_modules[k]=v[0]() + else: + arr_modules[k]=v[0] priv.fields['user_id'].name_form=HiddenForm diff --git a/paramecio/modules/admin2/templates/layout.phtml b/paramecio/modules/admin2/templates/layout.phtml index 8ee4f45..619a23d 100644 --- a/paramecio/modules/admin2/templates/layout.phtml +++ b/paramecio/modules/admin2/templates/layout.phtml @@ -118,7 +118,7 @@ lang_selected=session['lang']
- + ${show_flash_message()|n} <%block name="content">