From 522166141707fcca3f7ed96edb47bb8796b01c01 Mon Sep 17 00:00:00 2001 From: Antonio de la Rosa Date: Thu, 25 Aug 2016 01:26:18 +0200 Subject: [PATCH] Fixes in adminutils dropping circular imports --- paramecio/citoplasma/adminutils.py | 31 +----------------------------- 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/paramecio/citoplasma/adminutils.py b/paramecio/citoplasma/adminutils.py index 7c1cff1..6bef5fb 100644 --- a/paramecio/citoplasma/adminutils.py +++ b/paramecio/citoplasma/adminutils.py @@ -4,7 +4,6 @@ from collections import OrderedDict from paramecio.citoplasma.sessions import get_session from paramecio.citoplasma.urls import make_url from paramecio.cromosoma.webmodel import WebModel -from paramecio.citoplasma.mtemplates import PTemplate from paramecio.citoplasma.i18n import I18n try: @@ -72,32 +71,4 @@ def check_login(): return True return False - -def base_admin(func_view, env, title, **args): - - env.directories.insert(1, config.paramecio_root+'/modules/admin/templates') - - content_index='' - - connection=WebModel.connection() - #Fix, make local variable - - t=PTemplate(env) - - s=get_session() - - if check_login(): - - #Load menu - - menu=get_menu(config_admin.modules_admin) - - lang_selected=get_language(s) - - content_index=func_view(connection, t, s, **args) - - return t.load_template('admin/content.html', title=title, content_index=content_index, menu=menu, lang_selected=lang_selected, arr_i18n=I18n.dict_i18n) - - else: - redirect(make_url(config.admin_folder)) - + \ No newline at end of file