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] 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