Modernize basecode, now cromosoma and citoplasma are deleted by more comprensible libraries, and libraries.db directory names
This commit is contained in:
parent
94d3eef840
commit
50034d9ad6
108 changed files with 250 additions and 257 deletions
|
|
@ -1,11 +1,11 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
from paramecio.modules.admin.models.admin import UserAdmin
|
||||
from paramecio.citoplasma.urls import make_url
|
||||
from paramecio.citoplasma.generate_admin_class import GenerateAdminClass
|
||||
from paramecio.libraries.urls import make_url
|
||||
from paramecio.libraries.generate_admin_class import GenerateAdminClass
|
||||
from paramecio2.libraries.i18n import I18n, PGetText
|
||||
from paramecio.cromosoma.coreforms import SelectForm
|
||||
from paramecio.citoplasma.sessions import get_session
|
||||
from paramecio.libraries.db.coreforms import SelectForm
|
||||
from paramecio.libraries.sessions import get_session
|
||||
from settings import config
|
||||
from bottle import request
|
||||
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
import traceback, sys
|
||||
from paramecio.citoplasma.mtemplates import env_theme, PTemplate
|
||||
from paramecio.libraries.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, redirect
|
||||
from paramecio.citoplasma.sessions import get_session, generate_session
|
||||
from paramecio.libraries.i18n import load_lang, I18n
|
||||
from paramecio.libraries.urls import make_url, add_get_parameters, redirect
|
||||
from paramecio.libraries.sessions import get_session, generate_session
|
||||
from bottle import get,post,response,request, Bottle
|
||||
from settings import config
|
||||
from settings import config_admin
|
||||
from paramecio.citoplasma.adminutils import get_menu, get_language, make_admin_url, check_login, login_model
|
||||
from paramecio.citoplasma.httputils import GetPostFiles
|
||||
from paramecio.cromosoma.formsutils import show_form, pass_values_to_form, set_extra_forms_user
|
||||
from paramecio.cromosoma.coreforms import PasswordForm
|
||||
from paramecio.cromosoma.webmodel import WebModel
|
||||
from paramecio.libraries.adminutils import get_menu, get_language, make_admin_url, check_login, login_model
|
||||
from paramecio.libraries.httputils import GetPostFiles
|
||||
from paramecio.libraries.db.formsutils import show_form, pass_values_to_form, set_extra_forms_user
|
||||
from paramecio.libraries.db.coreforms import PasswordForm
|
||||
from paramecio.libraries.db.webmodel import WebModel
|
||||
from importlib import import_module, reload
|
||||
from collections import OrderedDict
|
||||
from time import time
|
||||
from paramecio.citoplasma.keyutils import create_key_encrypt, create_key_encrypt_256, create_key
|
||||
from paramecio.citoplasma.sendmail import SendMail
|
||||
from paramecio.libraries.keyutils import create_key_encrypt, create_key_encrypt_256, create_key
|
||||
from paramecio.libraries.sendmail import SendMail
|
||||
from os import path
|
||||
from paramecio.wsgiapp import app
|
||||
import copy
|
||||
|
|
@ -26,7 +26,7 @@ from paramecio.i18n import admin
|
|||
|
||||
admin_app=Bottle()
|
||||
|
||||
#from citoplasma.login import LoginClass
|
||||
#from libraries.login import LoginClass
|
||||
# Check login
|
||||
|
||||
yes_recovery_login=False
|
||||
|
|
@ -185,6 +185,8 @@ def home(module='', submodule='', t=t):
|
|||
|
||||
else:
|
||||
|
||||
c=0
|
||||
|
||||
user_admin.conditions=['WHERE privileges=%s', [2]]
|
||||
|
||||
c=user_admin.select_count()
|
||||
|
|
@ -503,5 +505,4 @@ def change_theme():
|
|||
|
||||
return {'error': error}
|
||||
|
||||
|
||||
app.mount('/'+config.admin_folder+'/', admin_app)
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
from paramecio.citoplasma.i18n import I18n
|
||||
from paramecio.cromosoma.webmodel import WebModel
|
||||
from paramecio.cromosoma.usermodel import UserModel
|
||||
from paramecio.cromosoma import corefields
|
||||
from paramecio.cromosoma.extrafields.emailfield import EmailField
|
||||
from paramecio.cromosoma.extrafields.passwordfield import PasswordField
|
||||
from paramecio.cromosoma.extrafields.langfield import LangField
|
||||
from paramecio.libraries.i18n import I18n
|
||||
from paramecio.libraries.db.webmodel import WebModel
|
||||
from paramecio.libraries.db.usermodel import UserModel
|
||||
from paramecio.libraries.db import corefields
|
||||
from paramecio.libraries.db.extrafields.emailfield import EmailField
|
||||
from paramecio.libraries.db.extrafields.passwordfield import PasswordField
|
||||
from paramecio.libraries.db.extrafields.langfield import LangField
|
||||
|
||||
class PrivilegesField(corefields.IntegerField):
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<%
|
||||
|
||||
from paramecio.citoplasma.sessions import get_session
|
||||
from paramecio.libraries.sessions import get_session
|
||||
|
||||
s=get_session()
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
#!/usr/bin/python3
|
||||
|
||||
from paramecio.wsgiapp import app
|
||||
from paramecio.citoplasma.mtemplates import env_theme, PTemplate
|
||||
from paramecio.libraries.mtemplates import env_theme, PTemplate
|
||||
from settings import config
|
||||
from paramecio.citoplasma.sessions import get_session
|
||||
from paramecio.citoplasma.i18n import I18n
|
||||
from paramecio.libraries.sessions import get_session
|
||||
from paramecio.libraries.i18n import I18n
|
||||
from bottle import response
|
||||
import os
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
|
||||
#from modules.pastafari.models.servers import OsServer
|
||||
from paramecio.citoplasma.generate_admin_class import GenerateConfigClass
|
||||
from paramecio.citoplasma.lists import SimpleList
|
||||
from paramecio.citoplasma.adminutils import make_admin_url
|
||||
#from paramecio.citoplasma.urls import make_url
|
||||
from paramecio.citoplasma.i18n import I18n
|
||||
from paramecio.citoplasma.urls import add_get_parameters
|
||||
from paramecio.libraries.generate_admin_class import GenerateConfigClass
|
||||
from paramecio.libraries.lists import SimpleList
|
||||
from paramecio.libraries.adminutils import make_admin_url
|
||||
#from paramecio.libraries.urls import make_url
|
||||
from paramecio.libraries.i18n import I18n
|
||||
from paramecio.libraries.urls import add_get_parameters
|
||||
from settings import config
|
||||
from paramecio.citoplasma.httputils import GetPostFiles
|
||||
from paramecio.cromosoma.coreforms import SelectForm, BaseForm
|
||||
from paramecio.cromosoma.extraforms.i18nform import I18nForm
|
||||
from paramecio.libraries.httputils import GetPostFiles
|
||||
from paramecio.libraries.db.coreforms import SelectForm, BaseForm
|
||||
from paramecio.libraries.db.extraforms.i18nform import I18nForm
|
||||
import re, json
|
||||
from collections import OrderedDict
|
||||
from importlib import import_module
|
||||
|
|
@ -94,7 +94,7 @@ def admin(**args):
|
|||
|
||||
file_lang="#!/usr/bin/env python3\n\n"
|
||||
|
||||
file_lang+="from paramecio.citoplasma.i18n import I18n\n\n"
|
||||
file_lang+="from paramecio.libraries.i18n import I18n\n\n"
|
||||
|
||||
z=0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
from paramecio.citoplasma.i18n import I18n
|
||||
from paramecio.libraries.i18n import I18n
|
||||
from bottle import get,response,request
|
||||
from paramecio.citoplasma.sessions import get_session
|
||||
from paramecio.citoplasma.urls import redirect
|
||||
from paramecio.libraries.sessions import get_session
|
||||
from paramecio.libraries.urls import redirect
|
||||
import re
|
||||
|
||||
@get('/change_lang/<lang>')
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
from paramecio.citoplasma.mtemplates import PTemplate, env_theme
|
||||
from paramecio.citoplasma.urls import make_url
|
||||
from paramecio.libraries.mtemplates import PTemplate, env_theme
|
||||
from paramecio.libraries.urls import make_url
|
||||
from paramecio.wsgiapp import app
|
||||
from settings import config
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue