From ab36784edd8ee09337c1e2842b339266fd84e499 Mon Sep 17 00:00:00 2001
From: Ivan Nieto <inietov@gmail.com>
Date: Mon, 30 Dec 2019 22:18:47 -0600
Subject: [PATCH 1/2] Added a parameter that http://snipe-it.app/fields
 expected, without it that functionality was broken (#7687)

Nice!
---
 resources/views/custom_fields/index.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php
index 3ecbc6635d..5f35a39d71 100644
--- a/resources/views/custom_fields/index.blade.php
+++ b/resources/views/custom_fields/index.blade.php
@@ -53,7 +53,7 @@
             @foreach($custom_fieldsets AS $fieldset)
             <tr>
               <td>
-                {{ link_to_route("fieldsets.show",$fieldset->name,['id' => $fieldset->id]) }}
+                {{ link_to_route("fieldsets.show",$fieldset->name,['fieldset' => $fieldset->id]) }}
               </td>
               <td>
                 {{ $fieldset->fields->count() }}

From 313cacdb718a9815630801a12d0543e064267064 Mon Sep 17 00:00:00 2001
From: Ivan Nieto <inietov@gmail.com>
Date: Fri, 17 Jan 2020 18:12:51 -0600
Subject: [PATCH 2/2] Select Import File fails in Develop [ch10598] (#7718)

* Delete an unused import, then replace a deprecated facade with the needed one for uploading files

* Added the needed use for the Request Facade
---
 app/Http/Controllers/Api/ImportController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Api/ImportController.php b/app/Http/Controllers/Api/ImportController.php
index 1ea456c4e9..5b9bcf6b75 100644
--- a/app/Http/Controllers/Api/ImportController.php
+++ b/app/Http/Controllers/Api/ImportController.php
@@ -10,7 +10,7 @@ use App\Models\Asset;
 use App\Models\Company;
 use App\Models\Import;
 use Artisan;
-use Illuminate\Support\Facades\Input;
+use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Storage;
 use League\Csv\Reader;
@@ -41,7 +41,7 @@ class ImportController extends Controller
     {
         $this->authorize('import');
         if (!config('app.lock_passwords')) {
-            $files = Input::file('files');
+            $files = Request::file('files');
             $path = config('app.private_uploads').'/imports';
             $results = [];
             $import = new Import;