diff --git a/source/app/controllers/main.py b/source/app/controllers/main.py index 0665e72..a342572 100644 --- a/source/app/controllers/main.py +++ b/source/app/controllers/main.py @@ -96,6 +96,11 @@ class AppValues(object): values = req.params session = req.env['beaker.session'] + if req.path == '/values/titlelogin': + req.context['result'] = self._db.get_values(table, values, session) + resp.status = falcon.HTTP_200 + return + if not 'userobj' in session and req.path != '/values/empresas': session.invalidate() raise falcon.HTTPTemporaryRedirect('/') diff --git a/source/app/middleware.py b/source/app/middleware.py index 8204b84..bbe031b 100644 --- a/source/app/middleware.py +++ b/source/app/middleware.py @@ -37,7 +37,9 @@ class AuthMiddleware(object): user = session.get('userobj', None) id_session = req.cookies.get('beaker.session.id', '') - if req.path == '/empresas' or req.path == '/values/empresas': + if req.path == '/values/titlelogin': + pass + elif req.path == '/empresas' or req.path == '/values/empresas': if MV: pass else: diff --git a/source/app/models/db.py b/source/app/models/db.py index 519f7a9..ad8f47c 100644 --- a/source/app/models/db.py +++ b/source/app/models/db.py @@ -25,6 +25,9 @@ class StorageEngine(object): return getattr(self, '_get_{}'.format(table))(values, session) return getattr(self, '_get_{}'.format(table))(values) + def _get_titlelogin(self, values): + return main.get_title_app(2) + def _get_canopenpre(self, values): return main.PreFacturasDetalle.can_open(values['id']) diff --git a/source/app/models/main.py b/source/app/models/main.py index 8516846..9717a86 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -17,7 +17,7 @@ if __name__ == '__main__': from controllers import util from settings import log, VERSION, PATH_CP, COMPANIES, PRE, CURRENT_CFDI, \ INIT_VALUES, DEFAULT_PASSWORD, DECIMALES, IMPUESTOS, DEFAULT_SAT_PRODUCTO, \ - CANCEL_SIGNATURE, PUBLIC, DEFAULT_SERIE_TICKET, DECIMALES_TAX + CANCEL_SIGNATURE, PUBLIC, DEFAULT_SERIE_TICKET, DECIMALES_TAX, TITLE_APP FORMAT = '{0:.2f}' @@ -194,13 +194,13 @@ def config_main(): punto_de_venta = util.get_bool(Configuracion.get_('chk_usar_punto_de_venta')) data = { - 'empresa': 'Empresa Libre', + 'empresa': get_title_app(3), 'punto_de_venta': punto_de_venta } if not obj is None: - titulo = 'Empresa Libre - {}' - data['empresa'] = titulo.format(obj.nombre) + titulo = '{} - {}' + data['empresa'] = titulo.format(data['empresa'], obj.nombre) return data @@ -5035,6 +5035,15 @@ def get_sat_productos(key): return util.get_sat_productos(key) +def get_title_app(by=1): + html = { + 1: '{}', + 2: 'Bienvenido a {}', + 3: '{}', + } + return html[by].format(TITLE_APP) + + def test_correo(values): server = { 'servidor': values['correo_servidor'], diff --git a/source/app/settings.py b/source/app/settings.py index 061ecdd..f27a2dc 100644 --- a/source/app/settings.py +++ b/source/app/settings.py @@ -19,6 +19,11 @@ try: except ImportError: SEAFILE_SERVER = {} +try: + from conf import TITLE_APP +except ImportError: + TITLE_APP = 'Empresa Libre' + DEBUG = DEBUG VERSION = '1.2.0' diff --git a/source/static/js/ui/login.js b/source/static/js/ui/login.js index 3a9a5da..a9f7271 100644 --- a/source/static/js/ui/login.js +++ b/source/static/js/ui/login.js @@ -16,12 +16,11 @@ var form_controls = [ ] -var msg_header = 'Bienvenido a Empresa Libre' - var ui_login = { rows: [ {maxHeight: 50}, - {view: 'template', template: msg_header, maxHeight: 50, css: 'login_header'}, + {view: 'template', id: 'title_login', template: '', maxHeight: 50, + css: 'login_header'}, {maxHeight: 50}, {cols: [{}, {type: 'space', padding: 5, rows: [ diff --git a/source/templates/login.html b/source/templates/login.html index e1e2fcd..7f41a58 100644 --- a/source/templates/login.html +++ b/source/templates/login.html @@ -36,6 +36,10 @@ function validate_login(){ webix.ready(function(){ webix.ui(ui_login); + webix.ajax().get("/values/titlelogin", function(text, data, xhr){ + var value = data.json(); + $$("title_login").setHTML(value); + }) });