From f4f4e69a16c342899eebbe0ce68eb3d4f1bd6847 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Wed, 29 Jan 2020 21:05:36 +0100 Subject: [PATCH] Fixes in admin, now use lists, not dict --- paramecio2/libraries/config_admin.py | 2 +- paramecio2/modules/admin/app.py | 4 ++-- paramecio2/modules/admin/settings/config_admin.py | 4 +++- paramecio2/modules/admin/templates/dashboard.phtml | 8 ++++++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/paramecio2/libraries/config_admin.py b/paramecio2/libraries/config_admin.py index a9026ca..9474e80 100644 --- a/paramecio2/libraries/config_admin.py +++ b/paramecio2/libraries/config_admin.py @@ -1,4 +1,4 @@ # Variable base for admin modules -config_admin={} +config_admin=[] diff --git a/paramecio2/modules/admin/app.py b/paramecio2/modules/admin/app.py index 9c6d6c6..5a53936 100644 --- a/paramecio2/modules/admin/app.py +++ b/paramecio2/modules/admin/app.py @@ -76,7 +76,7 @@ for app in config.apps: arr_modules_admin={} -for app_load in config_admin.values(): +for app_load in config_admin: #print(app) @@ -84,7 +84,7 @@ for app_load in config_admin.values(): arr_modules_admin[app_load[2]+'/']=import_module(app_load[1]) #print(app_load[1]) - else: + elif len(app_load)==4: arr_modules_admin[app_load[2]+'/'+app_load[3]]=import_module(app_load[1]) #print(app_load[1]) diff --git a/paramecio2/modules/admin/settings/config_admin.py b/paramecio2/modules/admin/settings/config_admin.py index 7640309..7716249 100644 --- a/paramecio2/modules/admin/settings/config_admin.py +++ b/paramecio2/modules/admin/settings/config_admin.py @@ -3,4 +3,6 @@ from paramecio2.libraries.i18n import I18n #modules_admin=[[I18n.lang('admin', 'users_admin', 'User\'s Admin'), 'paramecio.modules.admin.admin.ausers', 'ausers']] -config_admin['ausers']=[I18n.lang('admin', 'users', 'Users'), 'paramecio2.modules.admin.admin.ausers', 'ausers'] +config_admin.append([I18n.lang('admin', 'users', 'Users')]) + +config_admin.append([I18n.lang('admin', 'users_edit', 'Users edit'), 'paramecio2.modules.admin.admin.ausers', 'ausers']) diff --git a/paramecio2/modules/admin/templates/dashboard.phtml b/paramecio2/modules/admin/templates/dashboard.phtml index 9aedd6e..c788560 100644 --- a/paramecio2/modules/admin/templates/dashboard.phtml +++ b/paramecio2/modules/admin/templates/dashboard.phtml @@ -41,7 +41,7 @@ from paramecio2.libraries.config_admin import config_admin %> - % for admin in config_admin.values(): + % for admin in config_admin: <% @@ -59,7 +59,7 @@
  •  ${admin[0]}
  • - % else: + % elif len(admin)==3: <% if admin[2]+'/'+admin[3]==path_module: @@ -69,6 +69,10 @@
  •  ${admin[0]}
  • + % elif len(admin)==1: + +
  • ${admin[0]}
  • + % endif % endfor