From 253371376d30c555e10a6011d006a4b3c84c6561 Mon Sep 17 00:00:00 2001 From: Nadeu Date: Thu, 19 Jan 2023 11:27:53 +0100 Subject: [PATCH 1/2] Update HWMD iso to 2022.12.2-beta --- ereuse_devicehub/workbench/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ereuse_devicehub/workbench/__init__.py b/ereuse_devicehub/workbench/__init__.py index 8f9bf153..70ac8a85 100644 --- a/ereuse_devicehub/workbench/__init__.py +++ b/ereuse_devicehub/workbench/__init__.py @@ -4,7 +4,7 @@ isos = { 'url': 'https://releases.usody.com/demo/', }, "register": { - 'iso': "USODY_2022.12.1-beta.iso", + 'iso': "USODY_2022.12.2-beta.iso", 'url': 'https://releases.usody.com/2022/', }, "erease": { From 00c07161e041713c91e331b2684a84c87665afc3 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 31 Jan 2023 12:38:47 +0100 Subject: [PATCH 2/2] add link to price --- ereuse_devicehub/inventory/views.py | 1 - ereuse_devicehub/views.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index b9c3a659..ed3939be 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -67,7 +67,6 @@ class DeviceListMixin(GenericMixin): page = int(request.args.get('page', 1)) per_page = int(request.args.get('per_page', PER_PAGE)) filter = request.args.get('filter', "All+Computers") - # import pdb; pdb.set_trace() lots = self.context['lots'] form_filter = FilterForm(lots, lot_id, all_devices=all_devices) diff --git a/ereuse_devicehub/views.py b/ereuse_devicehub/views.py index 89ccc6e4..fd852da0 100644 --- a/ereuse_devicehub/views.py +++ b/ereuse_devicehub/views.py @@ -1,4 +1,5 @@ import flask +from decouple import config from flask import Blueprint from flask import current_app as app from flask import g @@ -46,7 +47,7 @@ class LoginView(View): url_reset_password = "#" if 'register' in app.blueprints.keys(): - url_register = flask.url_for('register.user-registration') + url_register = config("PRICES_PAGE", "#") if 'reset_password' in app.blueprints.keys(): url_reset_password = flask.url_for('reset_password.reset-password')