From fcff7e8d020dc2e7d800ff2a7c7970fa8ca7fd58 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 9 Sep 2022 11:48:23 +0200 Subject: [PATCH 1/2] change only_unassigned for one specific url --- ereuse_devicehub/inventory/forms.py | 4 ++-- ereuse_devicehub/inventory/views.py | 24 ++++++++++++------- .../templates/ereuse_devicehub/base_site.html | 2 +- .../templates/inventory/device_list.html | 8 +++---- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py index d2e6dafe..31c7d6c4 100644 --- a/ereuse_devicehub/inventory/forms.py +++ b/ereuse_devicehub/inventory/forms.py @@ -125,10 +125,10 @@ class FilterForm(FlaskForm): ) def __init__(self, lots, lot_id, *args, **kwargs): + self.all_devices = kwargs.pop('all_devices', False) super().__init__(*args, **kwargs) self.lots = lots self.lot_id = lot_id - self.only_unassigned = kwargs.pop('only_unassigned', True) self._get_types() def _get_types(self): @@ -149,7 +149,7 @@ class FilterForm(FlaskForm): self.devices = Device.query.filter(Device.owner_id == g.user.id).filter( Device.binding == None # noqa: E711 ) - if self.only_unassigned: + if not self.all_devices: self.devices = self.devices.filter_by(lots=None) def search(self): diff --git a/ereuse_devicehub/inventory/views.py b/ereuse_devicehub/inventory/views.py index 4c1b38dd..32199783 100644 --- a/ereuse_devicehub/inventory/views.py +++ b/ereuse_devicehub/inventory/views.py @@ -2,7 +2,6 @@ import copy import csv import logging import os -from distutils.util import strtobool from io import StringIO from pathlib import Path @@ -59,10 +58,11 @@ logger = logging.getLogger(__name__) class DeviceListMixin(GenericMixin): template_name = 'inventory/device_list.html' - def get_context(self, lot_id, only_unassigned=True): + def get_context(self, lot_id=None, all_devices=False): super().get_context() + lots = self.context['lots'] - form_filter = FilterForm(lots, lot_id, only_unassigned=only_unassigned) + form_filter = FilterForm(lots, lot_id, all_devices=all_devices) devices = form_filter.search() lot = None form_transfer = '' @@ -91,7 +91,7 @@ class DeviceListMixin(GenericMixin): 'lot': lot, 'tags': self.get_user_tags(), 'list_devices': self.get_selected_devices(form_new_action), - 'unassigned_devices': only_unassigned, + 'all_devices': all_devices, } ) @@ -114,10 +114,13 @@ class DeviceListMixin(GenericMixin): class DeviceListView(DeviceListMixin): def dispatch_request(self, lot_id=None): - only_unassigned = request.args.get( - 'only_unassigned', default=True, type=strtobool - ) - self.get_context(lot_id, only_unassigned) + self.get_context(lot_id) + return flask.render_template(self.template_name, **self.context) + + +class AllDeviceListView(DeviceListMixin): + def dispatch_request(self): + self.get_context(all_devices=True) return flask.render_template(self.template_name, **self.context) @@ -128,7 +131,7 @@ class AdvancedSearchView(DeviceListMixin): def dispatch_request(self): query = request.args.get('q', '') - self.get_context(None) + self.get_context() form = AdvancedSearchForm(q=query) self.context.update({'devices': form.devices, 'advanced_form': form}) return flask.render_template(self.template_name, **self.context) @@ -1202,6 +1205,9 @@ devices.add_url_rule( view_func=NewTradeDocumentView.as_view('trade_document_add'), ) devices.add_url_rule('/device/', view_func=DeviceListView.as_view('devicelist')) +devices.add_url_rule( + '/all/device/', view_func=AllDeviceListView.as_view('alldevicelist') +) devices.add_url_rule( '/search/', view_func=AdvancedSearchView.as_view('advanced_search') ) diff --git a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html index 4d793495..b52bab2a 100644 --- a/ereuse_devicehub/templates/ereuse_devicehub/base_site.html +++ b/ereuse_devicehub/templates/ereuse_devicehub/base_site.html @@ -160,7 +160,7 @@
  • Devices
  • - diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html index 4502b63e..ab1bfa20 100644 --- a/ereuse_devicehub/templates/inventory/device_list.html +++ b/ereuse_devicehub/templates/inventory/device_list.html @@ -7,10 +7,10 @@
    1. Inventory
      2. {% if not lot %} - {% if unassigned_devices %} -
    2. Unassigned
      3. - {% else %} + {% if all_devices %}
    3. All devices
      4. + {% else %} +
    4. Unassigned
      5. {% endif %} {% elif lot.is_temporary %}
    5. Temporary Lot
      6. @@ -247,7 +247,7 @@
    6. - {% if unassigned_devices %} + {% if not all_devices %} Devices Lots Spreadsheet From 3f4ad1d57aae3d5070db776ed1633619049899db Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 9 Sep 2022 13:44:51 +0200 Subject: [PATCH 2/2] fix basic test --- tests/test_basic.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_basic.py b/tests/test_basic.py index a37437ee..6ee73062 100644 --- a/tests/test_basic.py +++ b/tests/test_basic.py @@ -55,6 +55,7 @@ def test_api_docs(client: Client): '/inventory/device/add/', '/inventory/device/{id}/', '/inventory/device/{dhid}/binding/', + '/inventory/all/device/', '/inventory/export/{export_id}/', '/inventory/lot/add/', '/inventory/lot/{id}/',