trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #401 from eReuse/bugfix/4042-new-var-in-environment 

fix db_host
This commit is contained in:
cayop 2022-11-08 18:59:33 +01:00 committed by GitHub
parent fe33f2d7e7 25f2287e98
commit cf5a7651a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ereuse_devicehub/templates/workbench/wbSettings.ini
View File

@ -3,7 +3,7 @@
DH_TOKEN = {{ token }} DH_TOKEN = {{ token }}
DH_URL = {{ url }} DH_URL = {{ url }}
{% if erease_basic %} {% if erease_basic %}
DH_HOST = {{ host }} DH_HOST = {{ api_host }}
DH_DATABASE = {{ schema }} DH_DATABASE = {{ schema }}
DEVICEHUB_URL = https://${DB_HOST}/${DB_DATABASE}/ DEVICEHUB_URL = https://${DB_HOST}/${DB_DATABASE}/
@ -17,7 +17,7 @@ WB_ERASE_LEADING_ZEROS = False
WB_DEBUG = True WB_DEBUG = True
{% elif baseline_erease %} {% elif baseline_erease %}
DH_HOST = {{ host }} DH_HOST = {{ api_host }}
DH_DATABASE = {{ schema }} DH_DATABASE = {{ schema }}
DEVICEHUB_URL = https://${DB_HOST}/${DB_DATABASE}/ DEVICEHUB_URL = https://${DB_HOST}/${DB_DATABASE}/

1
ereuse_devicehub/workbench/views.py
View File

@ -68,6 +68,7 @@ class SettingsView(GenericMixin):
url = "https://{}/actions/".format(app.config['API_HOST']) url = "https://{}/actions/".format(app.config['API_HOST'])
self.wbContext['url'] = url self.wbContext['url'] = url
self.wbContext['host'] = app.config['HOST'] self.wbContext['host'] = app.config['HOST']
self.wbContext['api_host'] = app.config['API_HOST']
self.wbContext['schema'] = app.config['SCHEMA'] self.wbContext['schema'] = app.config['SCHEMA']
if self.opt == 'erease_basic': if self.opt == 'erease_basic':