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

Fix in plugins

Browse source
This commit is contained in:
Antonio de la Rosa 2021-04-05 14:22:39 +02:00
parent 3ad7d911b1
commit b07ef206b5
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
paramecio/citoplasma/plugins.py
View file

@ -9,12 +9,13 @@ class LoginPlugin(object):
name = 'login' name = 'login'
api = 2 api = 2
login_url='login'
def __init__(self, keyword='login'): def __init__(self, keyword='login', login_var='login', login_url='login'):
self.keyword=keyword self.keyword=keyword
self.login_var=login_var
self.login_url=login_url
def setup(self, app): def setup(self, app):
''' Make sure that other installed plugins don't affect the same keyword argument.''' ''' Make sure that other installed plugins don't affect the same keyword argument.'''
@ -26,10 +27,10 @@ class LoginPlugin(object):
def apply(self, callback, context): def apply(self, callback, context):
# Test if the original callback accepts a 'db' keyword. # Test if the original callback accepts a 'login' keyword.
# Ignore it if it does not need a login handle. # Ignore it if it does not need a login handle.
conf = context.config.get('login') or {} conf = context.config.get(self.keyword) or {}
keyword = conf.get('keyword', self.keyword) keyword = conf.get('keyword', self.keyword)
@ -42,7 +43,7 @@ class LoginPlugin(object):
s=get_session() s=get_session()
if 'login' in s: if self.login_var in s:
rv = callback(*args, **kwargs) rv = callback(*args, **kwargs)

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

@ -11,18 +11,18 @@ ${make_url('admin/'+module)}\
<meta http-equiv="content-type" content="text/html; charset=UTF-8"> <meta http-equiv="content-type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0;"> <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0;">
<title>${title}</title> <title>${title}</title>
${HeaderHTML.css_home()|n}
<link href="${make_media_url('css/admin.css', 'admin')}" rel="stylesheet" /> <link href="${make_media_url('css/admin.css', 'admin')}" rel="stylesheet" />
<link href="${make_media_url('css/font-awesome.min.css', 'admin')}" rel="stylesheet" /> <link href="${make_media_url('css/font-awesome.min.css', 'admin')}" rel="stylesheet" />
<link href="${make_media_url('css/responsive-nav.css', 'admin')}" rel="stylesheet" /> <link href="${make_media_url('css/responsive-nav.css', 'admin')}" rel="stylesheet" />
<link href="${make_media_url('css/tooltipster.bundle.min.css', 'admin')}" rel="stylesheet" /> <link href="${make_media_url('css/tooltipster.bundle.min.css', 'admin')}" rel="stylesheet" />
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
${HeaderHTML.css_home()|n}
<%block name="extra_css"> <%block name="extra_css">
</%block> </%block>
${HeaderHTML.js_home()|n}
<script language="Javascript" src="${make_media_url('js/jquery.min.js', 'admin')}"></script> <script language="Javascript" src="${make_media_url('js/jquery.min.js', 'admin')}"></script>
<script language="Javascript" src="${make_media_url('js/responsive-nav.min.js', 'admin')}"></script> <script language="Javascript" src="${make_media_url('js/responsive-nav.min.js', 'admin')}"></script>
<script language="Javascript" src="${make_media_url('js/tooltipster.bundle.min.js', 'admin')}"></script> <script language="Javascript" src="${make_media_url('js/tooltipster.bundle.min.js', 'admin')}"></script>
${HeaderHTML.js_home()|n}
<%block name="extra_js"> <%block name="extra_js">
</%block> </%block>
${HeaderHTML.header_home()|n} ${HeaderHTML.header_home()|n}