Bumped version

Signed-off-by: snipe <snipe@snipe.net>
Merge pull request #10315 from snipe/fixes/escape_custom_fields_in_api_response
2021-11-16 12:02:45 -08:00 · 2021-11-15 20:33:51 -08:00 · 2021-11-15 20:32:59 -08:00 · 2021-11-15 14:29:34 -08:00 · 2021-11-15 14:28:59 -08:00 · 2021-11-15 14:28:37 -08:00
25 changed files with 251 additions and 199 deletions
@@ -96,6 +96,8 @@ RUN \
      && rm -r "/var/www/html/storage/app/backups" && ln -fs "/var/lib/snipeit/dumps" "/var/www/html/storage/app/backups" \
      && mkdir -p "/var/lib/snipeit/keys" && ln -fs "/var/lib/snipeit/keys/oauth-private.key" "/var/www/html/storage/oauth-private.key" \
      && ln -fs "/var/lib/snipeit/keys/oauth-public.key" "/var/www/html/storage/oauth-public.key" \
+      && ln -fs "/var/lib/snipeit/keys/ldap_client_tls.cert" "/var/www/html/storage/ldap_client_tls.cert" \
+      && ln -fs "/var/lib/snipeit/keys/ldap_client_tls.key" "/var/www/html/storage/ldap_client_tls.key" \
      && chown docker "/var/lib/snipeit/keys/" \
      && chown -h docker "/var/www/html/storage/" \
      && chmod +x /var/www/html/artisan \
@@ -370,15 +370,21 @@ class AssetsController extends Controller
    public function showBySerial(Request $request, $serial)
    {
        $this->authorize('index', Asset::class);
-        if ($assets = Asset::with('assetstatus')->with('assignedTo')
-            ->withTrashed()->where('serial',$serial)->get()) {
-                return (new AssetsTransformer)->transformAssets($assets, $assets->count());
+
+        $assets = Asset::with('assetstatus')->with('assignedTo');
+
+        if ($request->input('deleted', 'false') === 'true') {
+            $assets = $assets->withTrashed();
        }
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200);

+        $assets = $assets->where('serial', $serial)->get();
+        if ($assets) {
+            return (new AssetsTransformer)->transformAssets($assets, $assets->count());
+        } else {
+            return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200);
+        }
    }

-
    /**
     * Returns JSON with information about an asset for detail view.
     *
@@ -904,7 +910,7 @@ class AssetsController extends Controller
            }
        }

-        return response()->json(Helper::formatStandardApiResponse('error', ['asset_tag'=> e($request->input('asset_tag'))], 'Asset with tag '.$request->input('asset_tag').' not found'));
+        return response()->json(Helper::formatStandardApiResponse('error', ['asset_tag'=> e($request->input('asset_tag'))], 'Asset with tag '.e($request->input('asset_tag')).' not found'));



@@ -73,7 +73,7 @@ class StatuslabelsController extends Controller
        $statuslabel->archived          =  $statusType['archived'];
        $statuslabel->color             =  $request->input('color');
        $statuslabel->show_in_nav       =  $request->input('show_in_nav', 0);
-        $statuslabel->default_label     =  $request->input('default_label');
+        $statuslabel->default_label     =  $request->input('default_label', 0);


        if ($statuslabel->save()) {
@@ -93,15 +93,15 @@ class AssetsTransformer
                    $value = (Gate::allows('superadmin')) ? $decrypted : strtoupper(trans('admin/custom_fields/general.encrypted'));

                    $fields_array[$field->name] = [
-                            'field' => $field->convertUnicodeDbSlug(),
-                            'value' => $value,
+                            'field' => e($field->convertUnicodeDbSlug()),
+                            'value' => e($value),
                            'field_format' => $field->format,
                        ];

                } else {
                    $fields_array[$field->name] = [
-                        'field' => $field->convertUnicodeDbSlug(),
-                        'value' => $asset->{$field->convertUnicodeDbSlug()},
+                        'field' => e($field->convertUnicodeDbSlug()),
+                        'value' => e($asset->{$field->convertUnicodeDbSlug()}),
                        'field_format' => $field->format,
                    ];

@@ -114,25 +114,14 @@ class AssetsTransformer
        }

        $permissions_array['available_actions'] = [
-            'checkout' => Gate::allows('checkout', Asset::class),
-            'checkin' => Gate::allows('checkin', Asset::class),
-            'clone' => false,
-            'restore' => false,
-            'update' => (bool) Gate::allows('update', Asset::class),
-            'delete' => ($asset->assigned_to=='' && Gate::allows('delete', Asset::class)),
+            'checkout'      => ($asset->deleted_at=='' && Gate::allows('checkout', Asset::class)) ? true : false,
+            'checkin'       => ($asset->deleted_at=='' && Gate::allows('checkin', Asset::class)) ? true : false,
+            'clone'         => Gate::allows('create', Asset::class) ? true : false,
+            'restore'       => ($asset->deleted_at!='' && Gate::allows('create', Asset::class)) ? true : false,
+            'update'        => ($asset->deleted_at=='' && Gate::allows('update', Asset::class)) ? true : false,
+            'delete'        => ($asset->deleted_at=='' && $asset->assigned_to =='' && Gate::allows('delete', Asset::class)) ? true : false,
        ];

-        if ($asset->deleted_at!='') {
-            $permissions_array['available_actions'] = [
-                'checkout' => true,
-                'checkin' => false,
-                'clone' => Gate::allows('create', Asset::class),
-                'restore' => Gate::allows('create', Asset::class),
-                'update' => false,
-                'delete' => false,
-            ];
-        }
-


        if (request('components')=='true') {
@@ -145,7 +134,7 @@ class AssetsTransformer
                        
                            'id' => $component->id,
                            'pivot_id' => $component->pivot->id,
-                            'name' => $component->name,
+                            'name' => e($component->name),
                            'qty' => $component->pivot->assigned_qty,
                            'price_cost' => $component->purchase_cost,
                            'purchase_total' => $component->purchase_cost * $component->pivot->assigned_qty,
@@ -41,9 +41,12 @@ class ConsumableImporter extends ItemImporter
        $consumable = new Consumable();
        $this->item['model_number'] = $this->findCsvMatch($row, "model_number");;
        $this->item['item_no'] = $this->findCsvMatch($row, "item_number");
+        $this->item['min_amt'] = $this->findCsvMatch($row, "minimum quantity");
+        $this->log("min_amt " . $this->item["min_amt"]);
        $consumable->fill($this->sanitizeItemForStoring($consumable));
        //FIXME: this disables model validation.  Need to find a way to avoid double-logs without breaking everything.
        $consumable->unsetEventDispatcher();
+        $this->log(implode(",", $this->item));
        if ($consumable->save()) {
            $consumable->logCreate('Imported using CSV Importer');
            $this->log("Consumable " . $this->item["name"] . ' was created');
@@ -75,6 +75,7 @@ abstract class Importer
        'department' => 'department',
        'manager_first_name' => 'manager first name',
        'manager_last_name' => 'manager last name',
+        'min_amt' => 'minimum quantity',
    ];
    /**
     * Map of item fields->csv names
@@ -195,11 +196,11 @@ abstract class Importer
        $val = $default;
        $key = $this->lookupCustomKey($key);

-        // $this->log("Custom Key: ${key}");
+        $this->log("Custom Key: ${key}");
        if (array_key_exists($key, $array)) {
            $val = Encoding::toUTF8(trim($array[ $key ]));
        }
-        // $this->log("${key}: ${val}");
+        $this->log("${key}: ${val}");
        return $val;
    }

@@ -29,6 +29,7 @@
 | serial number       | serial           | Asset, license                            |
 | status              | status           | Asset ? All                               |
 | supplier            | supplier         | Asset ? All                               |
+| minimum quantity    | min_amt          | Consumable                                |
 | termination date    | termination_date | License                                   |
 | warranty months     | warranty_months  | Asset                                     |
 | User Related Fields | assigned_to      | Asset                                     |
@@ -68,6 +68,7 @@ class Consumable extends SnipeModel
        'purchase_cost',
        'purchase_date',
        'qty',
+        'min_amt',
        'requestable'
    ];

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v5.3.0',
-  'full_app_version' => 'v5.3.0 - build 6470-gf87ffb84d',
-  'build_version' => '6470',
+  'app_version' => 'v5.3.2',
+  'full_app_version' => 'v5.3.2 - build 6508-g7ce5993f5',
+  'build_version' => '6508',
  'prerelease_version' => '',
-  'hash_version' => 'gf87ffb84d',
-  'full_hash' => 'v5.3.0-128-gf87ffb84d',
+  'hash_version' => 'g7ce5993f5',
+  'full_hash' => 'v5.3.2-15-g7ce5993f5',
  'branch' => 'master',
 );
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # A supervisor event listener which terminates supervisord if any of its child
 # processes enter the FATAL state.
 # https://stackoverflow.com/a/37527488/119527
@@ -1090,7 +1090,6 @@
      "version": "7.12.18",
      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.18.tgz",
      "integrity": "sha512-BogPQ7ciE6SYAUPtlm9tWbgI9+2AgqSam6QivMgXgAT+fKbgppaj4ZX15MHeLC1PVF5sNk70huBu20XxWOs8Cg==",
-      "dev": true,
      "requires": {
        "regenerator-runtime": "^0.13.4"
      },
@@ -1098,26 +1097,7 @@
        "regenerator-runtime": {
          "version": "0.13.7",
          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-          "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/runtime-corejs3": {
-      "version": "7.12.18",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.12.18.tgz",
-      "integrity": "sha512-ngR7yhNTjDxxe1VYmhqQqqXZWujGb6g0IoA4qeG6MxNGRnIw2Zo8ImY8HfaQ7l3T6GklWhdNfyhWk0C0iocdVA==",
-      "optional": true,
-      "requires": {
-        "core-js-pure": "^3.0.0",
-        "regenerator-runtime": "^0.13.4"
-      },
-      "dependencies": {
-        "regenerator-runtime": {
-          "version": "0.13.7",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-          "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
-          "optional": true
+          "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
        }
      }
    },
@@ -2521,9 +2501,9 @@
      }
    },
    "base64-arraybuffer": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
-      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz",
+      "integrity": "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ=="
    },
    "base64-js": {
      "version": "1.5.1",
@@ -2713,9 +2693,9 @@
      "integrity": "sha1-EQPWvADPv6jPyaJZmrUYxVZD2j8="
    },
    "bootstrap-table": {
-      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.18.2.tgz",
-      "integrity": "sha512-BShrYY9bcadwxikP5Sd/+tZlbLcYqOBjYm5bdJLu3lRTgXEQ1p937ZNlcCMhIrRhvelUKlSl7EFORnEkSHR7gA=="
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.19.1.tgz",
+      "integrity": "sha512-WvV+l1AI/C+zThaKmfHmi/IuayVNB0qdFyEhFx1jyZhO0oLtNJNANkCR3rvJf6Dkh72dsLElxpE/bzK9seEQLA=="
    },
    "brace-expansion": {
      "version": "1.1.11",
@@ -3191,17 +3171,33 @@
      "dev": true
    },
    "canvg": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/canvg/-/canvg-3.0.7.tgz",
-      "integrity": "sha512-4sq6iL5Q4VOXS3PL1BapiXIZItpxYyANVzsAKpTPS5oq4u3SKbGfUcbZh2gdLCQ3jWpG/y5wRkMlBBAJhXeiZA==",
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/canvg/-/canvg-3.0.9.tgz",
+      "integrity": "sha512-rDXcnRPuz4QHoCilMeoTxql+fvGqNAxp+qV/KHD8rOiJSAfVjFclbdUNHD2Uqfthr+VMg17bD2bVuk6F07oLGw==",
      "optional": true,
      "requires": {
-        "@babel/runtime-corejs3": "^7.9.6",
+        "@babel/runtime": "^7.12.5",
        "@types/raf": "^3.4.0",
+        "core-js": "^3.8.3",
        "raf": "^3.4.1",
+        "regenerator-runtime": "^0.13.7",
        "rgbcolor": "^1.0.1",
        "stackblur-canvas": "^2.0.0",
-        "svg-pathdata": "^5.0.5"
+        "svg-pathdata": "^6.0.3"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "3.19.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.1.tgz",
+          "integrity": "sha512-Tnc7E9iKd/b/ff7GFbhwPVzJzPztGrChB8X8GLqoYGdEOG8IpLnK1xPyo3ZoO3HsK6TodJS58VGPOxA+hLHQMg==",
+          "optional": true
+        },
+        "regenerator-runtime": {
+          "version": "0.13.9",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+          "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+          "optional": true
+        }
      }
    },
    "caseless": {
@@ -3210,13 +3206,35 @@
      "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c="
    },
    "cfb": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.0.tgz",
-      "integrity": "sha512-sXMvHsKCICVR3Naq+J556K+ExBo9n50iKl6LGarlnvuA2035uMlGA/qVrc0wQtow5P1vJEw9UyrKLCbtIKz+TQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.1.tgz",
+      "integrity": "sha512-wT2ScPAFGSVy7CY+aauMezZBnNrfnaLSrxHUHdea+Td/86vrk6ZquggV+ssBR88zNs0OnBkL2+lf9q0K+zVGzQ==",
      "requires": {
-        "adler-32": "~1.2.0",
+        "adler-32": "~1.3.0",
        "crc-32": "~1.2.0",
-        "printj": "~1.1.2"
+        "printj": "~1.3.0"
+      },
+      "dependencies": {
+        "adler-32": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.0.tgz",
+          "integrity": "sha512-f5nltvjl+PRUh6YNfUstRaXwJxtfnKEWhAWWlmKvh+Y3J2+98a0KKVYDEhz6NdKGqswLhjNGznxfSsZGOvOd9g==",
+          "requires": {
+            "printj": "~1.2.2"
+          },
+          "dependencies": {
+            "printj": {
+              "version": "1.2.3",
+              "resolved": "https://registry.npmjs.org/printj/-/printj-1.2.3.tgz",
+              "integrity": "sha512-sanczS6xOJOg7IKDvi4sGOUOe7c1tsEzjwlLFH/zgwx/uyImVM9/rgBkc8AfiQa/Vg54nRd8mkm9yI7WV/O+WA=="
+            }
+          }
+        },
+        "printj": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/printj/-/printj-1.3.0.tgz",
+          "integrity": "sha512-017o8YIaz8gLhaNxRB9eBv2mWXI2CtzhPJALnQTP+OPpuUfP0RMWqr/mHCzqVeu1AQxfzSfAtAq66vKB8y7Lzg=="
+        }
      }
    },
    "chalk": {
@@ -3506,20 +3524,9 @@
      }
    },
    "codepage": {
-      "version": "1.14.0",
-      "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.14.0.tgz",
-      "integrity": "sha1-jL4lSBMjVZ19MHVxsP/5HnodL5k=",
-      "requires": {
-        "commander": "~2.14.1",
-        "exit-on-epipe": "~1.0.1"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.14.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
-          "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="
-        }
-      }
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz",
+      "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA=="
    },
    "collect.js": {
      "version": "4.28.6",
@@ -3803,12 +3810,6 @@
        }
      }
    },
-    "core-js-pure": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.9.0.tgz",
-      "integrity": "sha512-3pEcmMZC9Cq0D4ZBh3pe2HLtqxpGNJBLXF/kZ2YzK17RbKp94w0HFbdbSx8H8kAlZG5k76hvLrkPm57Uyef+kg==",
-      "optional": true
-    },
    "core-util-is": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -3945,11 +3946,11 @@
      }
    },
    "css-line-break": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-1.0.1.tgz",
-      "integrity": "sha1-GfIGOjPpX7KDG4ZEbAuAwYivRQo=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.0.1.tgz",
+      "integrity": "sha512-gwKYIMUn7xodIcb346wgUhE2Dt5O1Kmrc16PWi8sL4FTfyDj8P5095rzH7+O8CTZudJr+uw2GCI/hwEkDJFI2w==",
      "requires": {
-        "base64-arraybuffer": "^0.1.5"
+        "base64-arraybuffer": "^0.2.0"
      }
    },
    "css-loader": {
@@ -4244,9 +4245,9 @@
      }
    },
    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
    },
    "deepmerge": {
      "version": "2.2.1",
@@ -4467,9 +4468,9 @@
      }
    },
    "dompurify": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.6.tgz",
-      "integrity": "sha512-7b7ZArhhH0SP6W2R9cqK6RjaU82FZ2UPM7RO8qN1b1wyvC/NY1FNWcX1Pu00fFOAnzEORtwXe4bPaClg6pUybQ==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.3.3.tgz",
+      "integrity": "sha512-dqnqRkPMAjOZE0FogZ+ceJNM2dZ3V/yNOuFB7+39qpO93hHhfRpHw3heYQC7DPK9FqbQTfBKUJhiSfz4MvXYwg==",
      "optional": true
    },
    "domutils": {
@@ -11629,7 +11630,8 @@
        "picomatch": {
          "version": "2.2.2",
          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-          "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
+          "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+          "optional": true
        },
        "pify": {
          "version": "2.3.0",
@@ -14235,6 +14237,7 @@
              "version": "4.0.1",
              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
              "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+              "optional": true,
              "requires": {
                "is-extglob": "^2.1.1"
              }
@@ -14248,7 +14251,8 @@
            "normalize-path": {
              "version": "3.0.0",
              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-              "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+              "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+              "optional": true
            },
            "readdirp": {
              "version": "3.4.0",
@@ -15398,9 +15402,13 @@
      }
    },
    "html2canvas": {
-      "version": "0.5.0-beta4",
-      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-0.5.0-beta4.tgz",
-      "integrity": "sha1-goLGKsX9eBaPVwK15IdxV8qT854="
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.3.2.tgz",
+      "integrity": "sha512-4+zqv87/a1LsaCrINV69wVLGG8GBZcYBboz1JPWEgiXcWoD9kroLzccsBRU/L9UlfV2MAZ+3J92U9IQPVMDeSQ==",
+      "requires": {
+        "css-line-break": "2.0.1",
+        "text-segmentation": "^1.0.2"
+      }
    },
    "htmlescape": {
      "version": "1.1.1",
@@ -16233,9 +16241,12 @@
      "integrity": "sha1-G+i3twTdOFcVJwiu+x1KSzpp+zM="
    },
    "jquery-ui": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz",
-      "integrity": "sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE="
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.0.tgz",
+      "integrity": "sha512-Osf7ECXNTYHtKBkn9xzbIf9kifNrBhfywFEKxOeB/OVctVmLlouV9mfc2qXCp6uyO4Pn72PXKOnj09qXetopCw==",
+      "requires": {
+        "jquery": ">=1.8.0 <4.0.0"
+      }
    },
    "jquery-ui-bundle": {
      "version": "1.12.1",
@@ -16366,10 +16377,11 @@
      "integrity": "sha512-CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg=="
    },
    "jspdf": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-2.3.0.tgz",
-      "integrity": "sha512-KdWe3y5YGjuD8E3Yv1vN8BMuuaQR1jvLTlcZ4dQxUSr1ZveuTv1CnyXyafNL7xfi4eDcIdzs6z9tb9JRDiDCbg==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-2.4.0.tgz",
+      "integrity": "sha512-nsZ92YfbNG/EimR1yqmOkxf2D4iJRypBsw7pvP1aPiIEnoGITaLl6XDR/GYA36/R29vMZSBedpEhBCzutSGytA==",
      "requires": {
+        "@babel/runtime": "^7.14.0",
        "atob": "^2.1.2",
        "btoa": "^1.2.1",
        "canvg": "^3.0.6",
@@ -16379,35 +16391,24 @@
        "html2canvas": "^1.0.0-rc.5"
      },
      "dependencies": {
-        "base64-arraybuffer": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz",
-          "integrity": "sha512-7emyCsu1/xiBXgQZrscw/8KPRT44I4Yq9Pe6EGs3aPRTsWuggML1/1DTuZUuIaJPIm1FTDUVXl4x/yW8s0kQDQ==",
-          "optional": true
+        "@babel/runtime": {
+          "version": "7.16.0",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.0.tgz",
+          "integrity": "sha512-Nht8L0O8YCktmsDV6FqFue7vQLRx3Hb0B37lS5y0jDRqRxlBG4wIJHnf9/bgSE2UyipKFA01YtS+npRdTWBUyw==",
+          "requires": {
+            "regenerator-runtime": "^0.13.4"
+          }
        },
        "core-js": {
-          "version": "3.9.0",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.9.0.tgz",
-          "integrity": "sha512-PyFBJaLq93FlyYdsndE5VaueA9K5cNB7CGzeCj191YYLhkQM0gdZR2SKihM70oF0wdqKSKClv/tEBOpoRmdOVQ==",
+          "version": "3.19.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.1.tgz",
+          "integrity": "sha512-Tnc7E9iKd/b/ff7GFbhwPVzJzPztGrChB8X8GLqoYGdEOG8IpLnK1xPyo3ZoO3HsK6TodJS58VGPOxA+hLHQMg==",
          "optional": true
        },
-        "css-line-break": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-1.1.1.tgz",
-          "integrity": "sha512-1feNVaM4Fyzdj4mKPIQNL2n70MmuYzAXZ1aytlROFX1JsOo070OsugwGjj7nl6jnDJWHDM8zRZswkmeYVWZJQA==",
-          "optional": true,
-          "requires": {
-            "base64-arraybuffer": "^0.2.0"
-          }
-        },
-        "html2canvas": {
-          "version": "1.0.0-rc.7",
-          "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-rc.7.tgz",
-          "integrity": "sha512-yvPNZGejB2KOyKleZspjK/NruXVQuowu8NnV2HYG7gW7ytzl+umffbtUI62v2dCHQLDdsK6HIDtyJZ0W3neerA==",
-          "optional": true,
-          "requires": {
-            "css-line-break": "1.1.1"
-          }
+        "regenerator-runtime": {
+          "version": "0.13.9",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+          "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
        }
      }
    },
@@ -16419,6 +16420,11 @@
        "jspdf": "^1.0.272"
      },
      "dependencies": {
+        "base64-arraybuffer": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+          "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
+        },
        "canvg": {
          "version": "1.5.3",
          "resolved": "https://registry.npmjs.org/canvg/-/canvg-1.5.3.tgz",
@@ -16437,9 +16443,17 @@
            }
          }
        },
+        "css-line-break": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-1.0.1.tgz",
+          "integrity": "sha1-GfIGOjPpX7KDG4ZEbAuAwYivRQo=",
+          "requires": {
+            "base64-arraybuffer": "^0.1.5"
+          }
+        },
        "file-saver": {
-          "version": "git+ssh://git@github.com/eligrey/FileSaver.js.git#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
-          "from": "file-saver@github:eligrey/FileSaver.js#1.3.8"
+          "version": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
+          "from": "github:eligrey/FileSaver.js#1.3.8"
        },
        "html2canvas": {
          "version": "1.0.0-alpha.12",
@@ -16455,7 +16469,7 @@
          "integrity": "sha512-J9X76xnncMw+wIqb15HeWfPMqPwYxSpPY8yWPJ7rAZN/ZDzFkjCSZObryCyUe8zbrVRNiuCnIeQteCzMn7GnWw==",
          "requires": {
            "canvg": "1.5.3",
-            "file-saver": "git+ssh://git@github.com/eligrey/FileSaver.js.git#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
+            "file-saver": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
            "html2canvas": "1.0.0-alpha.12",
            "omggif": "1.0.7",
            "promise-polyfill": "8.1.0",
@@ -16463,8 +16477,8 @@
          },
          "dependencies": {
            "file-saver": {
-              "version": "git+ssh://git@github.com/eligrey/FileSaver.js.git#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
-              "from": "git+ssh://git@github.com/eligrey/FileSaver.js.git#e865e37af9f9947ddcced76b549e27dc45c1cb2e"
+              "version": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e",
+              "from": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e"
            }
          }
        },
@@ -18323,7 +18337,8 @@
      "version": "2.2.2",
      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-      "dev": true
+      "dev": true,
+      "optional": true
    },
    "pify": {
      "version": "2.3.0",
@@ -20572,9 +20587,9 @@
      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
    },
    "svg-pathdata": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-5.0.5.tgz",
-      "integrity": "sha512-TAAvLNSE3fEhyl/Da19JWfMAdhSXTYeviXsLSoDT1UM76ADj5ndwAPX1FKQEgB/gFMPavOy6tOqfalXKUiXrow==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-6.0.3.tgz",
+      "integrity": "sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==",
      "optional": true
    },
    "svgo": {
@@ -20731,6 +20746,14 @@
      "resolved": "https://registry.npmjs.org/tether/-/tether-1.4.7.tgz",
      "integrity": "sha1-1WqBhZDY/nLjh/d6Z/k6uW2OH7I="
    },
+    "text-segmentation": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.2.tgz",
+      "integrity": "sha512-uTqvLxdBrVnx/CFQOtnf8tfzSXFm+1Qxau7Xi54j4OPTZokuDOX8qncQzrg2G8ZicAMOM8TgzFAYTb+AqNO4Cw==",
+      "requires": {
+        "utrie": "^1.0.1"
+      }
+    },
    "throttleit": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
@@ -21235,6 +21258,21 @@
      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
      "dev": true
    },
+    "utrie": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.1.tgz",
+      "integrity": "sha512-JPaDXF3vzgZxfeEwutdGzlrNoVFL5UvZcbO6Qo9D4GoahrieUPoMU8GCpVpR7MQqcKhmShIh8VlbEN3PLM3EBg==",
+      "requires": {
+        "base64-arraybuffer": "^1.0.1"
+      },
+      "dependencies": {
+        "base64-arraybuffer": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz",
+          "integrity": "sha512-vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA=="
+        }
+      }
+    },
    "uuid": {
      "version": "3.4.0",
      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
@@ -22398,17 +22436,17 @@
      }
    },
    "xlsx": {
-      "version": "0.16.9",
-      "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.16.9.tgz",
-      "integrity": "sha512-gxi1I3EasYvgCX1vN9pGyq920Ron4NO8PNfhuoA3Hpq6Y8f0ECXiy4OLrK4QZBnj1jx3QD+8Fq5YZ/3mPZ5iXw==",
+      "version": "0.17.3",
+      "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.17.3.tgz",
+      "integrity": "sha512-dGZKfyPSXfnoITruwisuDVZkvnxhjgqzWJXBJm2Khmh01wcw8//baRUvhroVRhW2SLbnlpGcCZZbeZO1qJgMIw==",
      "requires": {
        "adler-32": "~1.2.0",
        "cfb": "^1.1.4",
-        "codepage": "~1.14.0",
+        "codepage": "~1.15.0",
        "commander": "~2.17.1",
        "crc-32": "~1.2.0",
        "exit-on-epipe": "~1.0.1",
-        "fflate": "^0.3.8",
+        "fflate": "^0.7.1",
        "ssf": "~0.11.2",
        "wmf": "~1.0.1",
        "word": "~0.3.0"
@@ -22420,9 +22458,9 @@
          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
        },
        "fflate": {
-          "version": "0.3.11",
-          "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.3.11.tgz",
-          "integrity": "sha512-Rr5QlUeGN1mbOHlaqcSYMKVpPbgLy0AWT/W0EHxA6NGI12yO1jpoui2zBBvU2G824ltM6Ut8BFgfHSBGfkmS0A=="
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.7.1.tgz",
+          "integrity": "sha512-VYM2Xy1gSA5MerKzCnmmuV2XljkpKwgJBKezW+495TTnTCh1x5HcYa1aH8wRU/MfTGhW4ziXqgwprgQUVl3Ohw=="
        }
      }
    },
@@ -32,7 +32,7 @@
    "bootstrap-colorpicker": "^2.5.3",
    "bootstrap-datepicker": "^1.9.0",
    "bootstrap-less": "^3.3.8",
-    "bootstrap-table": "^1.18.0",
+    "bootstrap-table": "^1.19.1",
    "chart.js": "^2.9.4",
    "css-loader": "^3.6.0",
    "ekko-lightbox": "^5.1.1",
@@ -41,7 +41,7 @@
    "imagemin": "^5.3.1",
    "jquery-form-validator": "^2.3.79",
    "jquery-slimscroll": "^1.3.8",
-    "jquery-ui": "^1.12.1",
+    "jquery-ui": "^1.13.0",
    "jquery-ui-bundle": "^1.12.1",
    "jquery.iframe-transport": "^1.0.0",
    "less": "^3.13.1",
@@ -51,7 +51,7 @@
    "phantomjs": "^2.1.7",
    "select2": "4.0.13",
    "sheetjs": "^2.0.0",
-    "tableexport.jquery.plugin": "^1.10.20",
+    "tableexport.jquery.plugin": "=1.10.21",
    "tether": "^1.4.0",
    "vue-resource": "^1.3.3"
  }
@@ -36,7 +36,7 @@
 */

 /*!
- * jQuery UI Widget 1.12.1
+ * jQuery UI Widget 1.13.0
 * http://jqueryui.com
 *
 * Copyright jQuery Foundation and other contributors
@@ -1,5 +1,5 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=7019b66f037a748a1f53",
+    "/js/build/app.js": "/js/build/app.js?id=fa8e6e2c8e6ebd812d15",
    "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=89f2b7816c4e00784b59",
    "/css/build/app.css": "/css/build/app.css?id=5d0d4ed9f5ea4d02b6fe",
    "/css/build/overrides.css": "/css/build/overrides.css?id=1a11d122b620ebdc8354",
@@ -18,15 +18,15 @@
    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=0409748eb4bb77fe171a",
    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=7abb3dcd41ad0d4700b7",
    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=96477616f4a4b4ff1db8",
-    "/css/dist/all.css": "/css/dist/all.css?id=37fdc8fe39054cbd2ad1",
+    "/css/dist/all.css": "/css/dist/all.css?id=d428302ff341ffec8b1b",
    "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212",
    "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b",
    "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",
    "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced",
-    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=d729a1e2e97f290cc4e2",
+    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=93c24b4c89490bbfd73e",
    "/js/build/vendor.js": "/js/build/vendor.js?id=b93877b4a88a76e1b18b",
-    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=a17945119a381c758e1f",
-    "/js/dist/all.js": "/js/dist/all.js?id=a2822770e4525cd4d568",
+    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=75760107ce879b26f156",
+    "/js/dist/all.js": "/js/dist/all.js?id=5999105216485cd776ad",
    "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=1f137fd2dcbac676d291",
    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=af88a4cc8e58dc298963",
    "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=5ef650950378aeb72dfa",
@@ -158,6 +158,7 @@
                    consumables: [
                        {id: 'item_no', text: "Item Number"},
                        {id: 'model_number', text: "Model Number"},
+                        {id: 'min_amt', text: "Minimum Quantity"},
                    ],
                    licenses: [
                        {id: 'asset_tag', text: 'Assigned To Asset'},
@@ -216,6 +217,7 @@
                            .concat(this.columnOptions.accessories)
                            .sort(sorter);
                    case 'consumable':
+                    	console.log('Returned consumable');
                        return this.columnOptions.general
                            .concat(this.columnOptions.consumables)
                            .sort(sorter);
@@ -309,4 +311,4 @@
            select2: require('../select2.vue').default
        }
    }
-</script>
+</script>
@@ -8,6 +8,7 @@ return array(
    'change' 		=> 'In/Out',
    'checkout_date' => 'Checkout Date',
    'checkoutto' 	=> 'Checked Out',
+    'current_value' => 'Current Value',
    'diff' 			=> 'Diff',
    'dl_csv' 		=> 'Download CSV',
    'eol' 			=> 'EOL',
@@ -20,6 +21,6 @@ return array(
    'title'      	=> 'Asset ',
    'image'		=> 'Device Image',
    'days_without_acceptance' => 'Days Without Acceptance',
-    'monthly_depreciation' => 'Monthly Depreciation'
+    'monthly_depreciation' => 'Monthly Depreciation',

 );
@@ -57,21 +57,28 @@
              <td>{{$field->element}}</td>
              <td>{{ $field->field_encrypted=='1' ?  trans('general.yes') : trans('general.no') }}</td>
                <td>
+                  
                    @if ($field->pivot->required)
-                        <a href="{{ route('fields.optional', [$custom_fieldset->id, $field->id]) }}">
-                            <i class="fa fa-check text-success" aria-hidden="true"></i>
-                            <span class="sr-only">Required - click to make optional</span>
-                        </a>
+                    <form method="post" action="{{ route('fields.optional', [$custom_fieldset->id, $field->id]) }}">
+                      @csrf 
+                      <button type="submit" class="btn btn-link"><i class="fa fa-check text-success" aria-hidden="true"></i></button>
+                      </form>
+
                    @else
-                        <a href="{{ route('fields.required', [$custom_fieldset->id, $field->id]) }}">
-                            <i class="fa fa-times text-danger" aria-hidden="true"></i>
-                            <span class="sr-only">Optional - click to make required</span>
-                        </a>
+
+                      <form method="post" action="{{ route('fields.required', [$custom_fieldset->id, $field->id]) }}">
+                      @csrf 
+                      <button type="submit" class="btn btn-link"><i class="fa fa-times text-danger" aria-hidden="true"></i></button>
+                      </form>
                    @endif
+                    
                </td>
              <td>
                @can('update', $custom_fieldset)
-                <a href="{{ route('fields.disassociate', [$field, $custom_fieldset->id]) }}" class="btn btn-sm btn-danger">Remove</a>
+                <form method="post" action="{{ route('fields.disassociate', [$field, $custom_fieldset->id]) }}">
+                  @csrf 
+                  <button type="submit" class="btn btn-sm btn-danger">Remove</button>
+                </form>
                @endcan
              </td>
            </tr>
@@ -108,14 +108,14 @@
                 @if ($snipeSettings->brand == '3')
                      <a class="logo navbar-brand no-hover" href="{{ url('/') }}">
                          @if ($snipeSettings->logo!='')
-                          <img class="navbar-brand-img" src="{{ Storage::disk('public')->url('/').e($snipeSettings->logo) }}" alt="{{ $snipeSettings->site_name }} logo">
+                          <img class="navbar-brand-img" src="{{ Storage::disk('public')->url($snipeSettings->logo) }}" alt="{{ $snipeSettings->site_name }} logo">
                          @endif
                          {{ $snipeSettings->site_name }}
                      </a>
                  @elseif ($snipeSettings->brand == '2')
                      <a class="logo navbar-brand no-hover" href="{{ url('/') }}">
                          @if ($snipeSettings->logo!='')
-                            <img class="navbar-brand-img" src="{{ Storage::disk('public')->url('/').e($snipeSettings->logo) }}" alt="{{ $snipeSettings->site_name }} logo">
+                            <img class="navbar-brand-img" src="{{ Storage::disk('public')->url($snipeSettings->logo) }}" alt="{{ $snipeSettings->site_name }} logo">
                          @endif
                          <span class="sr-only">{{ $snipeSettings->site_name }}</span>
                      </a>
@@ -354,10 +354,17 @@
                     @endcan
                     <li class="divider"></li>
                     <li>
-                         <a href="{{ url('/logout') }}">
-                             <i class="fa fa-sign-out fa-fw" aria-hidden="true"></i>
-                             {{ trans('general.logout') }}
-                         </a>
+
+                        <a href="{{ route('logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
+                            <i class="fa fa-sign-out fa-fw"></i> {{ trans('general.logout') }}
+                                    {{ csrf_field() }}
+                        </a>
+                        
+                        <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
+                            {{ csrf_field() }}
+                        </form>
+
+                    
                     </li>
                 </ul>
               </li>
@@ -832,7 +839,7 @@

    <!-- end main container -->

-    <div class="modal  modal-danger fade" id="dataConfirmModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal modal-danger fade" id="dataConfirmModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
        <div class="modal-dialog">
            <div class="modal-content">
                <div class="modal-header">
@@ -845,7 +852,7 @@
                    {{ csrf_field() }}
                    {{ method_field('DELETE') }}

-                    <button type="button" class="btn btn-default  pull-left" data-dismiss="modal">{{ trans('general.cancel') }}</button>
+                    <button type="button" class="btn btn-default pull-left" data-dismiss="modal">{{ trans('general.cancel') }}</button>
                    <button type="submit" class="btn btn-outline" id="dataConfirmOK">{{ trans('general.yes') }}</button>
                </form>
                </div>
@@ -463,12 +463,6 @@ Route::group(['middleware' => 'web'], function () {
            'uses' => 'Auth\LoginController@login' ]
    );

-    Route::get(
-        'logout',
-        [
-            'as' => 'logout',
-            'uses' => 'Auth\LoginController@logout' ]
-    );

 });

@@ -7,17 +7,17 @@

 Route::group([ 'prefix' => 'fields','middleware' => ['auth'] ], function () {

-    Route::get('required/{fieldset_id}/{field_id}',
+    Route::post('required/{fieldset_id}/{field_id}',
        ['uses' => 'CustomFieldsetsController@makeFieldRequired',
            'as' => 'fields.required']
    );

-    Route::get('optional/{fieldset_id}/{field_id}',
+    Route::post('optional/{fieldset_id}/{field_id}',
        ['uses' => 'CustomFieldsetsController@makeFieldOptional',
            'as' => 'fields.optional']
    );

-    Route::get('{field_id}/fieldset/{fieldset_id}/disassociate',
+    Route::post('{field_id}/fieldset/{fieldset_id}/disassociate',
        ['uses' => 'CustomFieldsController@deleteFieldFromFieldset',
        'as' => 'fields.disassociate']
    );
Author	SHA1	Message	Date
snipe	78809c0fe7	Bumped version Signed-off-by: snipe <snipe@snipe.net>	2021-11-16 12:02:45 -08:00
snipe	7ce5993f5a	Merge pull request #10315 from snipe/fixes/escape_custom_fields_in_api_response Escape custom field values in API response	2021-11-15 20:33:51 -08:00
snipe	f7b483358f	Escape custom field values in API response Signed-off-by: snipe <snipe@snipe.net>	2021-11-15 20:32:59 -08:00
snipe	e75a5f13ec	Merge pull request #10303 from inietov/fixes/weird_field_showing_up Added the current_value string to correspondig 'en' language directory	2021-11-15 14:29:34 -08:00
snipe	cf4e13f4df	Merge pull request #10312 from andrewshulgin/patch-1 Fixed: #10311: Docker: ldap_client_tls.{key,cert} are located in /var/www/html/storage instead of /var/lib/snipeit/keys	2021-11-15 14:28:59 -08:00
snipe	8e7565cbe9	Merge pull request #10313 from snipe/snyk-fix-d1fb08ebb2899913c99652bb6e188696 [Snyk] Security upgrade bootstrap-table from 1.18.3 to 1.19.1	2021-11-15 14:28:37 -08:00
snyk-bot	4839b0e008	fix: package.json & package-lock.json to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-BOOTSTRAPTABLE-1657597	2021-11-13 05:19:33 +00:00
Andrew Shulgin	d3ddafdff4	Dockerfile: symlink for ldap_client_tls.{cert,key}	2021-11-13 03:00:09 +02:00
Ivan Nieto Vivanco	b07db3b324	Added the current_value string to correspondig 'en' language directory	2021-11-11 14:43:47 -06:00
snipe	9ed1442bd1	Merge pull request #10286 from uberbrady/fix_bulk_audit_xss Escape asset_tag attribute at controller level for bulk checkout	2021-11-08 20:32:02 -08:00
Brady Wetherington	3ea209a507	Escape asset_tag attribute at controller level for consumption in bulk checkout	2021-11-08 20:27:43 -08:00
snipe	edf98cb795	Merge pull request #10279 from snipe/fixes/turn_get_into_post_for_custom_field_required Turn custom fields required/optional/remove into POST requests	2021-11-08 14:37:36 -08:00
snipe	16d18bc7eb	Merge pull request #10283 from snipe/fixes/remove_get_logout_route	2021-11-08 12:55:19 -08:00
snipe	38c36af6fc	Changes logout to POST Signed-off-by: snipe <snipe@snipe.net>	2021-11-08 12:53:11 -08:00
snipe	b5855e7be5	Removed get route for logout Signed-off-by: snipe <snipe@snipe.net>	2021-11-08 12:35:15 -08:00
snipe	0d811d067c	Turn cusotm fields required/optional/remove into POST requests Signed-off-by: snipe <snipe@snipe.net>	2021-11-05 10:53:48 -07:00
snipe	fba0e2b712	Revert tableexport (It broke the npm run prod build) Signed-off-by: snipe <snipe@snipe.net>	2021-11-03 16:17:19 -07:00
snipe	608c2f91a8	Updated package lock Signed-off-by: snipe <snipe@snipe.net>	2021-11-03 16:04:48 -07:00
snipe	960028b376	Bumped version Signed-off-by: snipe <snipe@snipe.net>	2021-11-03 16:04:39 -07:00
snipe	6690a0f1df	Merge pull request #10257 from Wouter0100/patch-1 fix(Docker): use correct python binary for exit listener	2021-11-02 14:53:35 -07:00
Wouter van Os	2c49c32e72	Fixed #10231 : use correct python binary for exit listener This fixes #10231, without creating an own Dockerfile.	2021-11-02 13:06:36 +01:00
snipe	76cc46c419	Merge pull request #9814 from 01ste02/importMinAmt Improved Consumable Import: Import min_amt for consumables	2021-10-28 17:49:44 -07:00
snipe	dc71f6ddc6	Merge pull request #9871 from jethron/patch-1 Fixed: double slashes in branding logo URL path	2021-10-28 17:36:43 -07:00
snipe	7470fdb605	Merge pull request #9912 from snipe/snyk-upgrade-1377cc2d38a76585c814757398543f5f [Snyk] Upgrade tableexport.jquery.plugin from 1.10.21 to 1.10.26	2021-10-28 17:15:10 -07:00
snipe	930e220cf1	Merge pull request #9915 from snipe/snyk-upgrade-b2b26cf8ec7a697fe0094f699652a345 [Snyk] Upgrade bootstrap-table from 1.18.2 to 1.18.3	2021-10-28 17:12:47 -07:00
snipe	2f9e5f79af	Merge pull request #10139 from FliegenKLATSCH/patch-1 API: Do not include deleted items per default on lookup by serial	2021-10-28 17:09:20 -07:00
snipe	927fba179d	Merge pull request #10241 from snipe/snyk-fix-a23047e623395f58c0f4d50feb55a3a3 [Snyk] Security upgrade jquery-ui from 1.12.1 to 1.13.0	2021-10-28 16:35:32 -07:00
snyk-bot	dfde50732b	fix: package.json & package-lock.json to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-JQUERYUI-1767167 - https://snyk.io/vuln/SNYK-JS-JQUERYUI-1767175 - https://snyk.io/vuln/SNYK-JS-JQUERYUI-1767767	2021-10-28 07:28:38 +00:00
snipe	7455318fcf	Merge pull request #10225 from snipe/fixes/default_label_in_status_label_api Set default_label to 0 instead of null in API	2021-10-25 20:18:37 -07:00
snipe	17bf899a17	Set default_label to 0 instead of null in API Signed-off-by: snipe <snipe@snipe.net>	2021-10-25 20:14:01 -07:00
snipe	a5230319b8	Merge pull request #10223 from snipe/fixes/fixed_missing_clone_button Fixed #10222 - fixed permissions array to handle missing clone button	2021-10-25 15:39:28 -07:00
snipe	8b1c60a17a	Make gates a little more consistent Signed-off-by: snipe <snipe@snipe.net>	2021-10-25 15:34:22 -07:00
snipe	033c3253bb	Fixed permissions array to handle missing clone button Signed-off-by: snipe <snipe@snipe.net>	2021-10-25 14:10:17 -07:00
FliegenKLATSCH	24c484303e	Do not include deleted assets by default when doing lookup by serial This commit introduces a new query parameter `deleted`, which can be set to `true` to include deleted assets in the response.	2021-10-09 08:56:31 +02:00
snyk-bot	3fedcc6766	fix: upgrade bootstrap-table from 1.18.2 to 1.18.3 Snyk has created this PR to upgrade bootstrap-table from 1.18.2 to 1.18.3. See this package in npm: https://www.npmjs.com/package/bootstrap-table See this project in Snyk: https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=upgrade-pr	2021-08-07 21:41:02 +00:00
snyk-bot	892ae9cf91	fix: upgrade tableexport.jquery.plugin from 1.10.21 to 1.10.26 Snyk has created this PR to upgrade tableexport.jquery.plugin from 1.10.21 to 1.10.26. See this package in npm: https://www.npmjs.com/package/tableexport.jquery.plugin See this project in Snyk: https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=upgrade-pr	2021-08-07 21:40:51 +00:00
Jethro Nederhof	d8fdd1b408	Fix branding logo URL path The current method adds an additional slash to the URL which results in the logo request producing a 404 error on for Storage drivers like S3 and GCS that don't automatically collapse additional forward slashes into single slashes. E.g. with the current code my logo URL renders like `https://storage.googleapis.com/mybucketname/public//setting-logo-Al0aKMhmYz.svg` (note the double slash after "public") when instead it should render like `https://storage.googleapis.com/mybucketname/public/setting-logo-Al0aKMhmYz.svg` For a local driver this should work fine since webservers handle the additional slashes case, but for key-based storage this 404s. Thanks for your work on Snipe-It, seems like a good system so far!	2021-07-28 14:55:34 +10:00
Oskar Stenberg	5b5874499d	Added import for min_amt for consumables	2021-07-12 11:46:19 +02:00