Fixes in tests and add check_login function to admin cntroller

This commit is contained in:
Antonio de la Rosa 2016-08-02 04:58:00 +02:00
parent b41461cc2c
commit da9a37a406
10 changed files with 33 additions and 9 deletions

View file

@ -22,6 +22,8 @@ def start():
parser.add_argument('--symlink', help='Set if create direct symlink to paramecio in new site', required=False, nargs='?', const='1')
parser.add_argument('--tests', help='Create a symlink to tests for check into paramecio site', required=False, nargs='?', const='1')
# Options for deploy
parser.add_argument('--domain', help='The base domain for this site', required=True)
@ -125,6 +127,13 @@ def start():
except:
print('Error: cannot symlink paramecio in new site')
if args.tests!=None:
try:
os.symlink(workdir, args.path+'/paramecio/', True)
except:
print('Error: cannot symlink paramecio in new site')
with open(path_settings+'/config.py', 'r') as f:
conf=f.read()

View file

@ -10,7 +10,7 @@ from bottle import get,post,response,request
from settings import config
from settings import config_admin
from paramecio.citoplasma.lists import SimpleList
from paramecio.citoplasma.adminutils import get_menu, get_language, make_admin_url
from paramecio.citoplasma.adminutils import get_menu, get_language, make_admin_url, check_login
from paramecio.citoplasma.generate_admin_class import GenerateAdminClass
from paramecio.citoplasma.httputils import GetPostFiles
from paramecio.cromosoma.formsutils import show_form, pass_values_to_form, set_extra_forms_user
@ -72,7 +72,7 @@ def home(module='', submodule=''):
s=get_session()
if 'login' in s:
if check_login():
s['id']=s.get('id', 0)