paramecio/parameciofm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Multiple fixes for go to most pythonic way

Browse source
This commit is contained in:
Antonio de la Rosa 2016-05-23 05:26:50 +02:00
parent a2e8c937f7
commit dd4cd73785
9 changed files with 131 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

17
paramecio/modules/admin/index.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/python3
import traceback, sys
from paramecio.citoplasma.mtemplates import ptemplate
from paramecio.citoplasma.mtemplates import env_theme, PTemplate
from paramecio.modules.admin.models.admin import UserAdmin
from paramecio.citoplasma.i18n import load_lang, I18n
from paramecio.citoplasma.urls import make_url, add_get_parameters
@ -21,6 +21,7 @@ from collections import OrderedDict
from time import time
from paramecio.citoplasma.keyutils import create_key_encrypt
from os import path
import copy
#from citoplasma.login import LoginClass
# Check login
@ -31,14 +32,12 @@ key_encrypt=create_key_encrypt()
module_admin=path.dirname(__file__)
t=ptemplate(__file__)
env=env_theme(__file__)
def make_admin_url(url):
return make_url('%s/%s' % (config.admin_folder, url))
t.add_filter(make_admin_url)
@get('/'+config.admin_folder)
@get('/'+config.admin_folder+'/<module>')
@post('/'+config.admin_folder+'/<module>')
@ -48,7 +47,13 @@ def home(module='', submodule=''):
# A simple boolean used for show or not the code of admin module in standard template
connection=WebModel.connection()
ptemplate.show_basic_template=True
#Fix, make local variable
t=PTemplate(env)
t.add_filter(make_admin_url)
t.show_basic_template=True
if submodule!='':
module+='/'+submodule
@ -130,7 +135,7 @@ def home(module='', submodule=''):
content_index=new_module.admin(t=t, connection=connection)
if ptemplate.show_basic_template==True:
if t.show_basic_template==True:
return t.load_template('admin/content.html', title=menu[module][0], content_index=content_index, menu=menu, lang_selected=lang_selected, arr_i18n=I18n.dict_i18n)
else: