From 8cb4954f8a4e54349aa48a98c3b14d7f0e686ee8 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 28 Sep 2016 14:58:01 -0700
Subject: [PATCH 1/3] Apply encrypted fields patch from develop

---
 resources/views/models/custom_fields_form.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index 9becec8fb4..b1728c4d23 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -27,11 +27,11 @@
           @else
             <!-- Text field -->
 
-            @can('admin')
+            @if (($field->field_encrypted=='0') || (Gate::allows('admin')))
             <input type="text" value="{{ Input::old($field->db_column_name(),(isset($asset) ? \App\Helpers\Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) : "")) }}" id="{{ $field->db_column_name() }}" class="form-control" name="{{ $field->db_column_name() }}" placeholder="Enter {{ strtolower($field->format) }} text">
                 @else
                     <input type="text" value="{{ strtoupper(trans('admin/custom_fields/general.encrypted')) }}" class="form-control disabled" disabled>
-            @endcan
+            @endif
 
           @endif
 

From 8774927b91ac74e0ec55b76ee8bd2b821b9affb6 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 28 Sep 2016 15:40:51 -0700
Subject: [PATCH 2/3] PHPStorm lag = fail

---
 app/Http/Controllers/AccessoriesController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/AccessoriesController.php b/app/Http/Controllers/AccessoriesController.php
index 67d121e21f..d8e155f988 100755
--- a/app/Http/Controllers/AccessoriesController.php
+++ b/app/Http/Controllers/AccessoriesController.php
@@ -126,7 +126,7 @@ class AccessoriesController extends Controller
         }
 
         return View::make('accessories/edit', compact('accessory'))
-          ->with('category_list', erper::categoryList('accessory'))
+          ->with('category_list', Helper::categoryList('accessory'))
           ->with('company_list', Helper::companyList())
           ->with('location_list', Helper::locationsList())
           ->with('manufacturer_list', Helper::manufacturerList());

From fc07753a5c1207cadeaf32d7166df68d1425a80b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 28 Sep 2016 19:18:01 -0700
Subject: [PATCH 3/3] Use $customfields in closure

---
 app/Http/Controllers/ReportsController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index f39a8a66c5..dcc93e0341 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -117,11 +117,11 @@ class ReportsController extends Controller
 
         $customfields = CustomField::get();
 
-        $response = new StreamedResponse(function(){
+        $response = new StreamedResponse(function() use ($customfields) {
             // Open output stream
             $handle = fopen('php://output', 'w');
 
-            Asset::with('assigneduser', 'assetloc','defaultLoc','assigneduser.userloc','model','supplier','assetstatus','model.manufacturer')->orderBy('created_at', 'DESC')->chunk(500, function($assets) use($handle) {
+            Asset::with('assigneduser', 'assetloc','defaultLoc','assigneduser.userloc','model','supplier','assetstatus','model.manufacturer')->orderBy('created_at', 'DESC')->chunk(500, function($assets) use($handle, $customfields) {
                 $headers=[
                     trans('general.company'),
                     trans('admin/hardware/table.asset_tag'),