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

Merge pull request #326 from eReuse/feature/hello-wb-settings 

new hello settings
This commit is contained in:
cayop 2022-08-04 15:24:41 +02:00 committed by GitHub
parent eea6d5c7e7 497d522ce8
commit 95c3803752
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ereuse_devicehub/config.py
View File

@ -81,6 +81,7 @@ class DevicehubConfig(Config):
"""Admin email""" """Admin email"""
EMAIL_ADMIN = config('EMAIL_ADMIN', '') EMAIL_ADMIN = config('EMAIL_ADMIN', '')
EMAIL_DEMO = config('EMAIL_DEMO', 'hello@usody.com')
"""Definition of path where save the documents of customers""" """Definition of path where save the documents of customers"""
PATH_DOCUMENTS_STORAGE = config('PATH_DOCUMENTS_STORAGE', '/tmp/') PATH_DOCUMENTS_STORAGE = config('PATH_DOCUMENTS_STORAGE', '/tmp/')

22
ereuse_devicehub/templates/workbench/settings.html
View File

@ -19,7 +19,7 @@
<div class="pt-6 pb-2"> <div class="pt-6 pb-2">
<h5 class="card-title text-center pb-0 fs-4">Download your settings for Workbench</h5> <h5 class="card-title text-center pb-0 fs-4">Download your settings for Workbench</h5>
<p class="text-center small">Please select one of this options</p> {% if not demo %}
<div class="row pt-3"> <div class="row pt-3">
<div class="col-5"> <div class="col-5">
<a href="{{ url_for('workbench.settings') }}?opt=register" class="btn btn-primary">Register devices</a> <a href="{{ url_for('workbench.settings') }}?opt=register" class="btn btn-primary">Register devices</a>
@ -34,14 +34,28 @@
<a href="/static/iso/{{ iso }}" class="btn btn-primary">{{ iso }}</a> <a href="/static/iso/{{ iso }}" class="btn btn-primary">{{ iso }}</a>
</div> </div>
<div class="col"> <div class="col">
<p class="small">Download ISO workbench and burn it one one usb stick.</p>
<p class="small"> <p class="small">
Download Checksum: <a style="color: #993365;" href="/static/iso/SHA512SUMS">SHA512SUMS</a> | Download Checksum: <a style="color: #993365;" href="/static/iso/SHA512SUMS">SHA512SUMS</a>
<a style="color: #993365;" href="/static/iso/SHA512SUMS.sign">Signature</a>
</p> </p>
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% else %}
{% if iso %}
<div class="row pt-3">
<div class="col-5">
<a href="/static/iso/demo/{{ iso }}" class="btn btn-primary">{{ iso }}</a>
</div>
<div class="col">
<p class="small">
Download Checksum: <a style="color: #993365;" href="/static/iso/demo/SHA512SUMS">SHA512SUMS</a>
</p>
</div>
</div>
{% endif %}
{% endif %}
</div> </div>
</div> </div>

9
ereuse_devicehub/workbench/views.py
View File

@ -24,12 +24,13 @@ class SettingsView(GenericMixin):
def dispatch_request(self): def dispatch_request(self):
self.get_context() self.get_context()
self.get_iso()
self.context.update( self.context.update(
{ {
'page_title': self.page_title, 'page_title': self.page_title,
'demo': g.user.email == app.config['EMAIL_DEMO'],
} }
) )
self.get_iso()
self.opt = request.values.get('opt') self.opt = request.values.get('opt')
if self.opt in ['register']: if self.opt in ['register']:
@ -39,8 +40,12 @@ class SettingsView(GenericMixin):
def get_iso(self): def get_iso(self):
path = Path(__file__).parent.parent path = Path(__file__).parent.parent
uri = f'{path}/static/iso/'
if self.context.get('demo'):
uri = f'{path}/static/iso/demo/'
files = [ files = [
f for f in os.listdir(f'{path}/static/iso/') if f[-3:].lower() == 'iso' f for f in os.listdir(uri) if f[-3:].lower() == 'iso'
] ]
self.context['iso'] = '' self.context['iso'] = ''