diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index ca007b18..b70b6df5 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -10,14 +10,29 @@ from werkzeug.exceptions import NotFound from ereuse_devicehub import messages from ereuse_devicehub.inventory.forms import ( - AllocateForm, DataWipeForm, LotDeviceForm, LotForm, NewActionForm, - NewDeviceForm, TagDeviceForm, TagForm, TagUnnamedForm, TradeDocumentForm, - TradeForm, UploadSnapshotForm) + AllocateForm, + DataWipeForm, + LotDeviceForm, + LotForm, + NewActionForm, + NewDeviceForm, + TagDeviceForm, + TagForm, + TagUnnamedForm, + TradeDocumentForm, + TradeForm, + UploadSnapshotForm +) from ereuse_devicehub.resources.action.models import Trade from ereuse_devicehub.resources.device.models import ( - Computer, DataStorage, Device) + Computer, + DataStorage, + Device +) from ereuse_devicehub.resources.documents.device_row import ( - ActionRow, DeviceRow) + ActionRow, + DeviceRow +) from ereuse_devicehub.resources.hash_reports import insert_hash from ereuse_devicehub.resources.lot.models import Lot from ereuse_devicehub.resources.tag.model import Tag @@ -38,7 +53,7 @@ class DeviceListMix(View): lot = None tags = ( Tag.query.filter(Tag.owner_id == current_user.id) - .filter_by(device_id=None) + .filter(Tag.device_id.is_(None)) .order_by(Tag.created.desc()) ) @@ -155,9 +170,8 @@ class LotCreateView(View): return flask.redirect(next_url) lots = Lot.query.filter(Lot.owner_id == current_user.id) - return flask.render_template( - self.template_name, form=form, title=self.title, lots=lots - ) + context = {'form': form, 'title': self.title, 'lots': lots} + return flask.render_template(self.template_name, **context) class LotUpdateView(View): @@ -174,9 +188,8 @@ class LotUpdateView(View): return flask.redirect(next_url) lots = Lot.query.filter(Lot.owner_id == current_user.id) - return flask.render_template( - self.template_name, form=form, title=self.title, lots=lots - ) + context = {'form': form, 'title': self.title, 'lots': lots} + return flask.render_template(self.template_name, **context) class LotDeleteView(View): @@ -197,15 +210,13 @@ class UploadSnapshotView(View): template_name = 'inventory/upload_snapshot.html' def dispatch_request(self): - context = {'page_title': 'Upload Snapshot'} lots = Lot.query.filter(Lot.owner_id == current_user.id).all() form = UploadSnapshotForm() + context = {'page_title': 'Upload Snapshot', 'lots': lots, 'form': form} if form.validate_on_submit(): form.save() - return flask.render_template( - self.template_name, form=form, lots=lots, **context - ) + return flask.render_template(self.template_name, **context) class DeviceCreateView(View): @@ -214,17 +225,15 @@ class DeviceCreateView(View): template_name = 'inventory/device_create.html' def dispatch_request(self): - context = {'page_title': 'New Device'} lots = Lot.query.filter(Lot.owner_id == current_user.id).all() form = NewDeviceForm() + context = {'page_title': 'New Device', 'lots': lots, 'form': form} if form.validate_on_submit(): form.save() next_url = url_for('inventory.devices.devicelist') return flask.redirect(next_url) - return flask.render_template( - self.template_name, form=form, lots=lots, **context - ) + return flask.render_template(self.template_name, **context) class TagListView(View): @@ -233,9 +242,10 @@ class TagListView(View): template_name = 'inventory/tag_list.html' def dispatch_request(self): + lots = Lot.query.filter(Lot.owner_id == current_user.id) tags = Tag.query.filter(Tag.owner_id == current_user.id) context = { - 'lots': [], + 'lots': lots, 'tags': tags, 'page_title': 'Tags Management', } @@ -248,7 +258,8 @@ class TagAddView(View): template_name = 'inventory/tag_create.html' def dispatch_request(self): - context = {'page_title': 'New Tag'} + lots = Lot.query.filter(Lot.owner_id == current_user.id) + context = {'page_title': 'New Tag', 'lots': lots} form = TagForm() if form.validate_on_submit(): form.save() @@ -264,7 +275,8 @@ class TagAddUnnamedView(View): template_name = 'inventory/tag_create_unnamed.html' def dispatch_request(self): - context = {'page_title': 'New Unnamed Tag'} + lots = Lot.query.filter(Lot.owner_id == current_user.id) + context = {'page_title': 'New Unnamed Tag', 'lots': lots} form = TagUnnamedForm() if form.validate_on_submit(): form.save() @@ -311,6 +323,7 @@ class TagUnlinkDeviceView(View): template_name = 'inventory/tag_unlink_device.html' def dispatch_request(self, id): + lots = Lot.query.filter(Lot.owner_id == current_user.id) form = TagDeviceForm(delete=True, device=id) if form.validate_on_submit(): form.remove() @@ -319,7 +332,7 @@ class TagUnlinkDeviceView(View): return flask.redirect(next_url) return flask.render_template( - self.template_name, form=form, referrer=request.referrer + self.template_name, form=form, lots=lots, referrer=request.referrer ) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index 5bd1994c..f9c1e075 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -5,7 +5,7 @@