Fixes in admin module for import admin files

This commit is contained in:
Antonio de la Rosa 2016-08-04 05:02:40 +02:00
parent 793b7a040f
commit 97367ba2c0

View file

@ -52,16 +52,15 @@ menu=get_menu(config_admin.modules_admin)
#arr_admin_modules={for k, in menu} #arr_admin_modules={for k, in menu}
#d = {key: value[1] for (key, value) in menu.items()} #d = {key: value[1] for (key, value) in menu.items()}
""" module_imported={}
d={}
for k, v in menu.items(): for k, v in menu.items():
#print(k[:1])
if k[:1]!='/': if k[:1]!='/':
d[k]=v[1] if type(v).__name__=='list':
module_imported[k]=import_module(v[1])
print(d) #print(d)
"""
@get('/'+config.admin_folder) @get('/'+config.admin_folder)
@get('/'+config.admin_folder+'/<module>') @get('/'+config.admin_folder+'/<module>')
@ -114,15 +113,16 @@ def home(module='', submodule=''):
try: try:
new_module=import_module(menu[module][1]) #new_module=import_module(menu[module][1])
#t.inject_folder=path.dirname(new_module.__file__).replace('/admin', '') #t.inject_folder=path.dirname(new_module.__file__).replace('/admin', '')
#t.env=t.env_theme(path.dirname(__file__)) #t.env=t.env_theme(path.dirname(__file__))
t.env.directories.insert(1, path.dirname(new_module.__file__).replace('/admin', '')+'/templates')
t.env.directories.insert(1, path.dirname(module_imported[module].__file__).replace('/admin', '')+'/templates')
#print(t.env.directories) #print(t.env.directories)
if config.reloader: #if config.reloader:
reload(new_module) #reload(new_module)
except ImportError: except ImportError:
@ -135,7 +135,7 @@ def home(module='', submodule=''):
#args={'t': t, 'connection': connection} #args={'t': t, 'connection': connection}
content_index=new_module.admin(t=t, connection=connection) content_index=module_imported[module].admin(t=t, connection=connection)
if t.show_basic_template==True: if t.show_basic_template==True: