From b4b12da477e96a93c8fdfd1ed32d85d8d3c02b07 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Tue, 15 Mar 2022 11:46:32 +0100 Subject: [PATCH] Add of DeviceHub in template --- ereuse_devicehub/__init__.py | 2 +- ereuse_devicehub/inventory/views.py | 38 +++++++++++++++---- .../templates/ereuse_devicehub/base_site.html | 2 +- ereuse_devicehub/views.py | 5 ++- 4 files changed, 37 insertions(+), 10 deletions(-) diff --git a/ereuse_devicehub/__init__.py b/ereuse_devicehub/__init__.py index c69e4574..688b5e56 100644 --- a/ereuse_devicehub/__init__.py +++ b/ereuse_devicehub/__init__.py @@ -1 +1 @@ -__version__ = "1.0.12-beta" +__version__ = "2.0.0-alpha" diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 57a67454..4ead3005 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -11,7 +11,7 @@ from requests.exceptions import ConnectionError from sqlalchemy import or_ from werkzeug.exceptions import NotFound -from ereuse_devicehub import messages +from ereuse_devicehub import __version__, messages from ereuse_devicehub.db import db from ereuse_devicehub.inventory.forms import ( AllocateForm, @@ -122,6 +122,7 @@ class DeviceListMix(GenericMixView): 'lot': lot, 'tags': tags, 'list_devices': list_devices, + 'version': __version__, } return self.context @@ -149,6 +150,7 @@ class DeviceDetailView(GenericMixView): 'device': device, 'lots': lots, 'page_title': 'Device {}'.format(device.devicehub_id), + 'version': __version__, } return flask.render_template(self.template_name, **context) @@ -207,7 +209,12 @@ class LotCreateView(GenericMixView): return flask.redirect(next_url) lots = self.get_lots() - context = {'form': form, 'title': self.title, 'lots': lots} + context = { + 'form': form, + 'title': self.title, + 'lots': lots, + 'version': __version__, + } return flask.render_template(self.template_name, **context) @@ -225,7 +232,12 @@ class LotUpdateView(View): return flask.redirect(next_url) lots = Lot.query.filter(Lot.owner_id == current_user.id) - context = {'form': form, 'title': self.title, 'lots': lots} + context = { + 'form': form, + 'title': self.title, + 'lots': lots, + 'version': __version__, + } return flask.render_template(self.template_name, **context) @@ -260,6 +272,7 @@ class UploadSnapshotView(GenericMixView): 'lots': lots, 'form': form, 'lot_id': lot_id, + 'version': __version__, } if form.validate_on_submit(): snapshot = form.save(commit=False) @@ -285,6 +298,7 @@ class DeviceCreateView(GenericMixView): 'lots': lots, 'form': form, 'lot_id': lot_id, + 'version': __version__, } if form.validate_on_submit(): snapshot = form.save(commit=False) @@ -314,6 +328,7 @@ class TagListView(View): 'lots': lots, 'tags': tags, 'page_title': 'Tags Management', + 'version': __version__, } return flask.render_template(self.template_name, **context) @@ -325,7 +340,7 @@ class TagAddView(View): def dispatch_request(self): lots = Lot.query.filter(Lot.owner_id == current_user.id) - context = {'page_title': 'New Tag', 'lots': lots} + context = {'page_title': 'New Tag', 'lots': lots, 'version': __version__} form = TagForm() if form.validate_on_submit(): form.save() @@ -342,7 +357,11 @@ class TagAddUnnamedView(View): def dispatch_request(self): lots = Lot.query.filter(Lot.owner_id == current_user.id) - context = {'page_title': 'New Unnamed Tag', 'lots': lots} + context = { + 'page_title': 'New Unnamed Tag', + 'lots': lots, + 'version': __version__, + } form = TagUnnamedForm() if form.validate_on_submit(): try: @@ -377,6 +396,7 @@ class TagDetailView(View): 'lots': lots, 'tag': tag, 'page_title': '{} Tag'.format(tag.code), + 'version': __version__, } return flask.render_template(self.template_name, **context) @@ -409,7 +429,11 @@ class TagUnlinkDeviceView(View): return flask.redirect(next_url) return flask.render_template( - self.template_name, form=form, lots=lots, referrer=request.referrer + self.template_name, + form=form, + lots=lots, + referrer=request.referrer, + version=__version__, ) @@ -522,7 +546,7 @@ class NewTradeDocumentView(View): return flask.redirect(next_url) return flask.render_template( - self.template_name, form=self.form, title=self.title + self.template_name, form=self.form, title=self.title, version=__version__ ) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index 8799068c..a84cea66 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -216,7 +216,7 @@ - Designed by BootstrapMade // DeviceHub v2.0.0a2 + Designed by BootstrapMade // DeviceHub {{ version }} diff --git a/ereuse_devicehub/views.py b/ereuse_devicehub/views.py index 6ad67aac..a79b0f53 100644 --- a/ereuse_devicehub/views.py +++ b/ereuse_devicehub/views.py @@ -3,6 +3,7 @@ from flask import Blueprint from flask.views import View from flask_login import current_user, login_required, login_user, logout_user +from ereuse_devicehub import __version__ from ereuse_devicehub.forms import LoginForm from ereuse_devicehub.resources.user.models import User from ereuse_devicehub.utils import is_safe_url @@ -31,7 +32,8 @@ class LoginView(View): return flask.redirect( next_url or flask.url_for('inventory.devices.devicelist') ) - return flask.render_template('ereuse_devicehub/user_login.html', form=form) + context = {'form': form, 'version': __version__} + return flask.render_template('ereuse_devicehub/user_login.html', **context) class LogoutView(View): @@ -47,6 +49,7 @@ class UserProfileView(View): def dispatch_request(self): context = { 'current_user': current_user, + 'version': __version__, } return flask.render_template(self.template_name, **context)