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

Many simple fixes in behaviour and install

Browse source
This commit is contained in:
Antonio de la Rosa 2016-10-17 17:50:56 +02:00
parent 7dc50deecb
commit 3e796eefa4
8 changed files with 99 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

4
paramecio/citoplasma/adminutils.py
View file

@ -53,6 +53,8 @@ def get_menu(modules_admin):
menu[mod[2]]=mod[0] menu[mod[2]]=mod[0]
for submod in mod[1]: for submod in mod[1]:
if submod[2] in menu:
print('WARNING: you would not set the admin url for '+submod[2]+' with same general name of module if is not stand alone admin file')
menu[submod[2]]=submod menu[submod[2]]=submod
return menu return menu
@ -70,4 +72,4 @@ def check_login():
return True return True
return False return False

4
paramecio/citoplasma/httputils.py
View file

@ -96,3 +96,7 @@ class GetPostFiles:
def obtain_files(self): def obtain_files(self):
self.files=request.files self.files=request.files
def request_method():
return request.method

26
paramecio/citoplasma/lists.py
View file

@ -42,9 +42,9 @@ class SimpleList:
#clean session #clean session
self.s['order']='0' self.order='0'
self.s['order_field']=self.model.name_field_id self.order_field=self.model.name_field_id
self.order_by=self.order_defaults[0] self.order_by=self.order_defaults[0]
@ -83,9 +83,9 @@ class SimpleList:
def obtain_order(self): def obtain_order(self):
self.s['order']=self.getpostfiles.get.get('order', self.s['order']) self.order=self.getpostfiles.get.get('order', self.order)
order_k=int(self.s['order']) order_k=int(self.order)
#Obtain from get #Obtain from get
""" """
@ -98,13 +98,13 @@ class SimpleList:
self.order_by=self.order_defaults[ order_k ] self.order_by=self.order_defaults[ order_k ]
self.s['order']=order_k self.order=order_k
def obtain_field_search(self): def obtain_field_search(self):
self.s['order_field']=self.getpostfiles.get.get('order_field', self.s['order_field']) self.order_field=self.getpostfiles.get.get('order_field', self.order_field)
field_k=self.s['order_field'] field_k=self.order_field
""" """
if 'order_field' in request.query.keys(): if 'order_field' in request.query.keys():
@ -113,7 +113,7 @@ class SimpleList:
if field_k in self.model.fields.keys(): if field_k in self.model.fields.keys():
self.s['order_field']=field_k self.order_field=field_k
for field in self.fields: for field in self.fields:
@ -122,16 +122,16 @@ class SimpleList:
if type(self.model.fields[field]).__name__=='ForeignKeyField': if type(self.model.fields[field]).__name__=='ForeignKeyField':
name_related=self.model.fields[field].related_model.name name_related=self.model.fields[field].related_model.name
for k in self.model.fields[field].related_model.fields.keys(): for k in self.model.fields[field].related_model.fields.keys():
self.change_order[field+'_'+k]=self.s['order'] self.change_order[field+'_'+k]=self.order
self.change_order[field]=self.s['order'] self.change_order[field]=self.order
if self.s['order']==0: if self.order==0:
self.change_order[field_k]=1 self.change_order[field_k]=1
else: else:
self.change_order[field_k]=0 self.change_order[field_k]=0
self.order_field=self.s['order_field'] #self.order_field=self.order_field
def search(self): def search(self):
@ -179,7 +179,7 @@ class SimpleList:
num_elements=self.limit_pages num_elements=self.limit_pages
link=add_get_parameters(self.url, search_text=self.search_text, search_field=self.search_field, order=self.s['order']) link=add_get_parameters(self.url, search_text=self.search_text, search_field=self.search_field, order=self.order)
begin_page=self.begin_page begin_page=self.begin_page

2
paramecio/create_module.py
View file

@ -26,6 +26,8 @@ def start():
try: try:
path.mkdir(0o755, True) path.mkdir(0o755, True)
open('modules/'+args.path+'/__init__.py', 'a').close()
except: except:
print('Error: cannot create the directory. Check if exists and if you have permissions') print('Error: cannot create the directory. Check if exists and if you have permissions')

48
paramecio/i18n/admin.py
View file

@ -4,53 +4,53 @@ from paramecio.citoplasma.i18n import I18n
I18n.l['en-US']={'admin': {}} I18n.l['en-US']={'admin': {}}
I18n.l['en-US']['admin']['sign_up']='Paramecio Sign up' I18n.l['en-US']['admin']['login']='Paramecio Login'
I18n.l['en-US']['admin']['remember_login']='Remember login?'
I18n.l['en-US']['admin']['send_email']='Email for recovery your password'
I18n.l['en-US']['admin']['administrator']='Administrator' I18n.l['en-US']['admin']['administrator']='Administrator'
I18n.l['en-US']['admin']['login']='Paramecio Login' I18n.l['en-US']['admin']['without_privileges']='Without privileges'
I18n.l['en-US']['admin']['remember_tries']='Remember that only have 3 attempts'
I18n.l['en-US']['admin']['welcome_to_paramecio']='Welcome to Paramecio Admin!!!'
I18n.l['en-US']['admin']['applications']='Applications' I18n.l['en-US']['admin']['applications']='Applications'
I18n.l['en-US']['admin']['sign_up']='Paramecio Sign up'
I18n.l['en-US']['admin']['recovery_password']='Recovery password?' I18n.l['en-US']['admin']['recovery_password']='Recovery password?'
I18n.l['en-US']['admin']['welcome_to_paramecio']='Welcome to Paramecio Admin!!!'
I18n.l['en-US']['admin']['send_password_email']='Your new password' I18n.l['en-US']['admin']['send_password_email']='Your new password'
I18n.l['en-US']['admin']['selected_privileges']='Selected privileges' I18n.l['en-US']['admin']['remember_tries']='Remember that only have 3 attempts'
I18n.l['en-US']['admin']['without_privileges']='Without privileges' I18n.l['en-US']['admin']['send_email']='Email for recovery your password'
I18n.l['en-US']['admin']['remember_login']='Remember login?'
I18n.l['en-US']['admin']['selected_privileges']='Selected privileges'
I18n.l['es-ES']={'admin': {}} I18n.l['es-ES']={'admin': {}}
I18n.l['es-ES']['admin']['sign_up']='Registrarse en Paramecio' I18n.l['es-ES']['admin']['login']='Login Paramecio'
I18n.l['es-ES']['admin']['remember_login']='¿Recordad login?'
I18n.l['es-ES']['admin']['send_email']='Email para recuperar tu contraseña'
I18n.l['es-ES']['admin']['administrator']='Administrador' I18n.l['es-ES']['admin']['administrator']='Administrador'
I18n.l['es-ES']['admin']['login']='Login Paramecio' I18n.l['es-ES']['admin']['without_privileges']='Sin privilegios'
I18n.l['es-ES']['admin']['remember_tries']='Recuerda que sólo tienes 3 intentos'
I18n.l['es-ES']['admin']['welcome_to_paramecio']='Bienvenido a Paramecio Framework!!!'
I18n.l['es-ES']['admin']['applications']='Aplicaciones' I18n.l['es-ES']['admin']['applications']='Aplicaciones'
I18n.l['es-ES']['admin']['sign_up']='Registrarse en Paramecio'
I18n.l['es-ES']['admin']['recovery_password']='¿Recuperar password?' I18n.l['es-ES']['admin']['recovery_password']='¿Recuperar password?'
I18n.l['es-ES']['admin']['welcome_to_paramecio']='Bienvenido a Paramecio Framework!!!'
I18n.l['es-ES']['admin']['send_password_email']='Tu nuevo password' I18n.l['es-ES']['admin']['send_password_email']='Tu nuevo password'
I18n.l['es-ES']['admin']['remember_tries']='Recuerda que sólo tienes 3 intentos'
I18n.l['es-ES']['admin']['send_email']='Email para recuperar tu contraseña'
I18n.l['es-ES']['admin']['remember_login']='¿Recordar login?'
I18n.l['es-ES']['admin']['selected_privileges']='Privilegios seleccionados' I18n.l['es-ES']['admin']['selected_privileges']='Privilegios seleccionados'
I18n.l['es-ES']['admin']['without_privileges']='Sin privilegios'

98
paramecio/i18n/common.py
View file

@ -4,93 +4,93 @@ from paramecio.citoplasma.i18n import I18n
I18n.l['en-US']={'common': {}} I18n.l['en-US']={'common': {}}
I18n.l['en-US']['common']['delete']='Delete' I18n.l['en-US']['common']['password_no_match']='Passwords doesn't match'
I18n.l['en-US']['common']['sign_up']='Sign up' I18n.l['en-US']['common']['login']='Login'
I18n.l['en-US']['common']['yes']='Yes' I18n.l['en-US']['common']['error_passwords_no_match']='Error: passwords doesn't match'
I18n.l['en-US']['common']['recovery_password']='Recovery password' I18n.l['en-US']['common']['error_login']='Error, wrong username or password'
I18n.l['en-US']['common']['add_new_item']='Add new item'
I18n.l['en-US']['common']['search']='Search'
I18n.l['en-US']['common']['error_passwords_no_match']='Error: passwords doesn\'t match'
I18n.l['en-US']['common']['last']='Last'
I18n.l['en-US']['common']['add_item']='Add new item' I18n.l['en-US']['common']['add_item']='Add new item'
I18n.l['en-US']['common']['no']='No' I18n.l['en-US']['common']['error_username_or_password_exists']='Error: username or email exists in database'
I18n.l['en-US']['common']['delete_item_you_sure']='Are you sure for delete this item?' I18n.l['en-US']['common']['home']='Home'
I18n.l['en-US']['common']['task_successful']='Task successful' I18n.l['en-US']['common']['recovery_password']='Recovery password'
I18n.l['en-US']['common']['login']='Login'
I18n.l['en-US']['common']['repeat_password']='Repeat Password' I18n.l['en-US']['common']['repeat_password']='Repeat Password'
I18n.l['en-US']['common']['pages']='Pages' I18n.l['en-US']['common']['pages']='Pages'
I18n.l['en-US']['common']['edit_new_item']='Edit item' I18n.l['en-US']['common']['delete']='Delete'
I18n.l['en-US']['common']['error_username_or_password_exists']='Error: username or email exists in database' I18n.l['en-US']['common']['last']='Last'
I18n.l['en-US']['common']['no']='No'
I18n.l['en-US']['common']['yes']='Yes'
I18n.l['en-US']['common']['sign_up']='Sign up'
I18n.l['en-US']['common']['search']='Search'
I18n.l['en-US']['common']['task_successful']='Task successful'
I18n.l['en-US']['common']['delete_item_you_sure']='Are you sure for delete this item?'
I18n.l['en-US']['common']['edit']='Edit' I18n.l['en-US']['common']['edit']='Edit'
I18n.l['en-US']['common']['edit_new_item']='Edit item'
I18n.l['en-US']['common']['add_new_item']='Add new item'
I18n.l['en-US']['common']['options']='Options' I18n.l['en-US']['common']['options']='Options'
I18n.l['en-US']['common']['error_login']='Error, wrong username or password'
I18n.l['en-US']['common']['home']='Home'
I18n.l['en-US']['common']['password_no_match']='Passwords doesn\'t match'
I18n.l['es-ES']={'common': {}} I18n.l['es-ES']={'common': {}}
I18n.l['es-ES']['common']['delete']='Borrar' I18n.l['es-ES']['common']['password_no_match']='Contraseñas no coinciden'
I18n.l['es-ES']['common']['sign_up']='Registrarse' I18n.l['es-ES']['common']['login']='Autenticación'
I18n.l['es-ES']['common']['yes']='Sí'
I18n.l['es-ES']['common']['recovery_password']='Recuperar contraseña'
I18n.l['es-ES']['common']['add_new_item']='Añadir nuevo elemento'
I18n.l['es-ES']['common']['search']='Buscar'
I18n.l['es-ES']['common']['error_passwords_no_match']='Error: contraseñas no coinciden' I18n.l['es-ES']['common']['error_passwords_no_match']='Error: contraseñas no coinciden'
I18n.l['es-ES']['common']['last']='Último' I18n.l['es-ES']['common']['error_login']='Error, nombre de usuario o password equivocado'
I18n.l['es-ES']['common']['add_item']='Añadir elemento' I18n.l['es-ES']['common']['add_item']='Añadir elemento'
I18n.l['es-ES']['common']['no']='No' I18n.l['es-ES']['common']['error_username_or_password_exists']='Error: nombre de usuario o email no existen en la base de datos'
I18n.l['es-ES']['common']['delete_item_you_sure']='¿Estás seguro de que deseas borrar este elemento?' I18n.l['es-ES']['common']['home']='Home'
I18n.l['es-ES']['common']['task_successful']='Tarea realizada con éxito' I18n.l['es-ES']['common']['recovery_password']='Recuperar contraseña'
I18n.l['es-ES']['common']['login']='Autenticación'
I18n.l['es-ES']['common']['repeat_password']='Repetir contraseña' I18n.l['es-ES']['common']['repeat_password']='Repetir contraseña'
I18n.l['es-ES']['common']['pages']='Paginas' I18n.l['es-ES']['common']['pages']='Paginas'
I18n.l['es-ES']['common']['edit_new_item']='Editar elemento' I18n.l['es-ES']['common']['delete']='Borrar'
I18n.l['es-ES']['common']['error_username_or_password_exists']='Error: nombre de usuario o email no existen en la base de datos' I18n.l['es-ES']['common']['last']='Último'
I18n.l['es-ES']['common']['no']='No'
I18n.l['es-ES']['common']['yes']='Sí'
I18n.l['es-ES']['common']['sign_up']='Registrarse'
I18n.l['es-ES']['common']['search']='Buscar'
I18n.l['es-ES']['common']['task_successful']='Tarea realizada con éxito'
I18n.l['es-ES']['common']['delete_item_you_sure']='¿Estás seguro de que deseas borrar este elemento?'
I18n.l['es-ES']['common']['edit']='Editar' I18n.l['es-ES']['common']['edit']='Editar'
I18n.l['es-ES']['common']['edit_new_item']='Editar elemento'
I18n.l['es-ES']['common']['add_new_item']='Añadir nuevo elemento'
I18n.l['es-ES']['common']['options']='Opciones' I18n.l['es-ES']['common']['options']='Opciones'
I18n.l['es-ES']['common']['error_login']='Error, nombre de usuario o password equivocado'
I18n.l['es-ES']['common']['home']='Home'
I18n.l['es-ES']['common']['password_no_match']='Contraseñas no coinciden'

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

@ -51,9 +51,8 @@ menu=get_menu(config_admin.modules_admin)
module_imported={} module_imported={}
for k, v in menu.items(): for k, v in menu.items():
if type(v).__name__=='list':
if k[:1]!='/': if k[:1]!='/':
if type(v).__name__=='list':
module_imported[k]=import_module(v[1]) module_imported[k]=import_module(v[1])
#print(d) #print(d)

4
paramecio/modules/admin/templates/admin/home.html
View file

@ -31,7 +31,7 @@ ${HeaderHTML.header_home()|n}
<div id="header"> <div id="header">
<a href="#nav" id="toggle"><i class="fa fa-bars" aria-hidden="true"></i><span>Menu</span></a> <a href="#nav" id="toggle"><i class="fa fa-bars" aria-hidden="true"></i><span>Menu</span></a>
<span id="title_phango">Paramecio</span> <span id="title_framework">Framework!</span> <span id="title_phango">Paramecio</span> <span id="title_framework">Framework!</span>
<!--<div id="languages_general"> <div id="languages_general">
<%def name="select_lang(i18n, lang_selected)"> <%def name="select_lang(i18n, lang_selected)">
% if i18n==lang_selected: % if i18n==lang_selected:
choose_flag choose_flag
@ -45,7 +45,7 @@ ${HeaderHTML.header_home()|n}
% endfor % endfor
% endif % endif
</div>--> </div>
</div> </div>
<div class="content_admin"> <div class="content_admin">
<nav id="menu" class="nav-collapse"> <nav id="menu" class="nav-collapse">