Merge branch 'develop'

Fix - Ir al admin para no admins

source/app/middleware.py

@@ -33,12 +33,19 @@ def static(req, res):
 class AuthMiddleware(object):
 
     def process_resource(self, req, resp, resource, params):
+        session = req.env['beaker.session']
+        user = session.get('userobj', None)
         id_session = req.cookies.get('beaker.session.id', '')
         if req.path == '/empresas' or req.path == '/values/empresas':
             if MV:
                 pass
             else:
                 raise falcon.HTTPTemporaryRedirect('/')
+        elif id_session and req.path == '/admin':
+            if user is None:
+                raise falcon.HTTPTemporaryRedirect('/')
+            elif not user.es_admin or not user.es_superusuario:
+                raise falcon.HTTPTemporaryRedirect('/main')
         elif not id_session and req.path != '/':
             raise falcon.HTTPTemporaryRedirect('/')
 

source/static/js/controller/main.js

@@ -4,7 +4,7 @@ var gi = null
 function configuracion_inicial(){
     webix.ajax().get('/values/admin', function(text, data){
         var values = data.json()
-        $$('cmd_ir_al_admin').show(values)
+        show('cmd_ir_al_admin', values)
     })
     webix.ajax().get('/values/main', function(text, data){
         var values = data.json()