bug fixes

This commit is contained in:
Steve Nyemba 2022-10-26 09:03:13 -05:00
parent 717251bd28
commit 2a7127485d
3 changed files with 24 additions and 10 deletions

View File

@ -63,14 +63,19 @@ def _dialog ():
global _config global _config
_uri = os.sep.join([_config['layout']['root'],request.headers['uri']]) _uri = os.sep.join([_config['layout']['root'],request.headers['uri']])
_id = request.headers['dom'] _id = request.headers['dom']
_html = cms.components.html(_uri,_id)
e = Environment(loader=BaseLoader()).from_string(_html)
# _data = cms.components.data(_config) # _data = cms.components.data(_config)
_args = {'system':_config['system']} _args = {'system':_config['system']}
_args['title'] = _id
if 'plugins' in _config :
_args['routes'] = _config['plugins']
_html = cms.components.html(_uri,_id,_args)
e = Environment(loader=BaseLoader()).from_string(_html)
_args['html'] = _html
_html = ''.join(["<div style='padding:1%'>",str( e.render(**_args)),'</div>']) _html = ''.join(["<div style='padding:1%'>",str( e.render(**_args)),'</div>'])
return render_template('dialog.html',title=_id,html=_html) return render_template('dialog.html',**_args) #title=_id,html=_html)
# return _html # return _html
# e = Environment(loader=BaseLoader()).from_string(_html) # e = Environment(loader=BaseLoader()).from_string(_html)
# _data = cms.components.data(_config) # _data = cms.components.data(_config)
@ -111,10 +116,12 @@ def _post (module,name):
_info = _pointer(_args) _info = _pointer(_args)
if _info: if _info:
code = 200 code = 200
else:
_info = ""
_info =io.BytesIO(_info) # _info =io.BytesIO(_info)
_info = base64.encodebytes(_info.getvalue()).decode('ascii') # _info = base64.encodebytes(_info.getvalue()).decode('ascii')
return _info,code return _info,code
@_app.route('/version') @_app.route('/version')
def _version (): def _version ():
@ -128,13 +135,16 @@ def cms_page():
global _config global _config
_uri = os.sep.join([_config['layout']['root'],request.headers['uri']]) _uri = os.sep.join([_config['layout']['root'],request.headers['uri']])
_id = request.headers['dom'] _id = request.headers['dom']
_args = {'system':_config['system']}
if 'plugins' in _config:
_args['routes'] = _config['plugins']
_html = cms.components.html(_uri,_id) _html = cms.components.html(_uri,_id,_args)
e = Environment(loader=BaseLoader()).from_string(_html) e = Environment(loader=BaseLoader()).from_string(_html)
# _data = {} #cms.components.data(_config) # _data = {} #cms.components.data(_config)
_args = {'system':_config['system'],'routes':_config['plugins']}
_html = ( e.render(**_args))
_html = e.render(**_args)
return _html,200 return _html,200

View File

@ -2,3 +2,5 @@ git+https://github.com/lnyemba/data-transport
flask flask
flask-session flask-session
requests requests
numpy
pandas

View File

@ -172,6 +172,8 @@ body {
background-color:#d3d3d3; background-color:#d3d3d3;
color:#4682b4; color:#4682b4;
font-weight:bold; font-weight:bold;
cursor:pointer;
padding:15px;
} }
.button-1:hover { .button-1:hover {
color:#FFFFFF; color:#FFFFFF;