From 2dfe8921ebb42c96df50bd0ced9128e15db71e04 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Mon, 9 Aug 2021 07:51:46 +1000
Subject: [PATCH] Fix URL getters

---
 lib/inventree/company.dart       |  4 ++--
 lib/inventree/model.dart         |  2 +-
 lib/inventree/part.dart          |  6 +++---
 lib/inventree/stock.dart         |  6 +++---
 lib/l10n                         |  2 +-
 lib/widget/category_display.dart | 23 -----------------------
 lib/widget/part_detail.dart      |  2 --
 7 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/lib/inventree/company.dart b/lib/inventree/company.dart
index ebfad90d..8a2a3b72 100644
--- a/lib/inventree/company.dart
+++ b/lib/inventree/company.dart
@@ -13,7 +13,7 @@ class InvenTreeCompany extends InvenTreeModel {
   String NAME = "Company";
 
   @override
-  String URL = "company/";
+  String get URL => "company/";
 
   InvenTreeCompany() : super();
 
@@ -49,7 +49,7 @@ class InvenTreeCompany extends InvenTreeModel {
  */
 class InvenTreeSupplierPart extends InvenTreeModel {
   @override
-  String URL = "company/part/";
+  String get URL => "company/part/";
 
   Map<String, String> _filters() {
     return {
diff --git a/lib/inventree/model.dart b/lib/inventree/model.dart
index 5f58c086..0a893f88 100644
--- a/lib/inventree/model.dart
+++ b/lib/inventree/model.dart
@@ -37,7 +37,7 @@ class InvenTreePageResponse {
 class InvenTreeModel {
 
   // Override the endpoint URL for each subclass
-  String URL = "";
+  String get URL => "";
 
   // Override the web URL for each subclass
   // Note: If the WEB_URL is the same (except for /api/) as URL then just leave blank
diff --git a/lib/inventree/part.dart b/lib/inventree/part.dart
index 60f12996..92b7cbd7 100644
--- a/lib/inventree/part.dart
+++ b/lib/inventree/part.dart
@@ -14,7 +14,7 @@ class InvenTreePartCategory extends InvenTreeModel {
   String NAME = "PartCategory";
 
   @override
-  String URL = "part/category/";
+  String get URL => "part/category/";
 
   @override
   Map<String, String> defaultListFilters() {
@@ -68,7 +68,7 @@ class InvenTreePartTestTemplate extends InvenTreeModel {
   String NAME = "PartTestTemplate";
 
   @override
-  String URL = "part/test-template/";
+  String get URL => "part/test-template/";
 
   String get key => jsondata['key'] ?? '';
 
@@ -125,7 +125,7 @@ class InvenTreePart extends InvenTreeModel {
   String NAME = "Part";
 
   @override
-  String URL = "part/";
+  String get URL => "part/";
 
   @override
   Map<String, String> defaultListFilters() {
diff --git a/lib/inventree/stock.dart b/lib/inventree/stock.dart
index 2147bd05..d3c5cb20 100644
--- a/lib/inventree/stock.dart
+++ b/lib/inventree/stock.dart
@@ -18,7 +18,7 @@ class InvenTreeStockItemTestResult extends InvenTreeModel {
   String NAME = "StockItemTestResult";
 
   @override
-  String URL = "stock/test/";
+  String get URL => "stock/test/";
 
   String get key => jsondata['key'] ?? '';
 
@@ -103,7 +103,7 @@ class InvenTreeStockItem extends InvenTreeModel {
   String NAME = "StockItem";
 
   @override
-  String URL = "stock/";
+  String get URL => "stock/";
 
   @override
   String WEB_URL = "stock/item/";
@@ -540,7 +540,7 @@ class InvenTreeStockLocation extends InvenTreeModel {
   String NAME = "StockLocation";
 
   @override
-  String URL = "stock/location/";
+  String get URL => "stock/location/";
 
   String get pathstring => jsondata['pathstring'] ?? '';
 
diff --git a/lib/l10n b/lib/l10n
index 3a2f1660..dd16aa78 160000
--- a/lib/l10n
+++ b/lib/l10n
@@ -1 +1 @@
-Subproject commit 3a2f1660fd5a93304272180b25340d04ba0e81aa
+Subproject commit dd16aa783769f261d73cb42ea70a831ddde04086
diff --git a/lib/widget/category_display.dart b/lib/widget/category_display.dart
index 04f03a74..cc65829d 100644
--- a/lib/widget/category_display.dart
+++ b/lib/widget/category_display.dart
@@ -43,27 +43,6 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
 
     List<Widget> actions = [];
 
-    /*
-    actions.add(
-        IconButton(
-          icon: FaIcon(FontAwesomeIcons.search),
-          onPressed: () {
-
-            Map<String, String> filters = {};
-
-            if (category != null) {
-              filters["category"] = "${category.pk}";
-            }
-
-            showSearch(
-                context: context,
-                delegate: PartSearchDelegate(context, filters: filters)
-            );
-          }
-        )
-    );
-     */
-
     if ((category != null) && InvenTreeAPI().checkPermission('part_category', 'change')) {
       actions.add(
         IconButton(
@@ -206,12 +185,10 @@ class _CategoryDisplayState extends RefreshableState<CategoryDisplayWidget> {
           label: L10().parts,
         ),
         // TODO - Add the "actions" item back in
-        /*
         BottomNavigationBarItem(
           icon: FaIcon(FontAwesomeIcons.wrench),
           label: L10().actions
         ),
-         */
       ]
     );
   }
diff --git a/lib/widget/part_detail.dart b/lib/widget/part_detail.dart
index 131cf921..e50c04a5 100644
--- a/lib/widget/part_detail.dart
+++ b/lib/widget/part_detail.dart
@@ -469,12 +469,10 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
           label: L10().stock
         ),
         // TODO - Add part actions
-        /*
         BottomNavigationBarItem(
           icon: FaIcon(FontAwesomeIcons.wrench),
           label: L10().actions,
         ),
-         */
       ]
     );
   }