From 657cfddd3cfa3bf76fa4d559fca94c2009666f34 Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Tue, 8 Mar 2022 18:28:13 -0600 Subject: [PATCH] Add a condition to show customfields as the user wants in localization settings --- resources/views/hardware/view.blade.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 870cabb4b2..d7b948604e 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -442,6 +442,8 @@ @can('superuser') @if (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) {{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }} + @elseif (($field->format=='DATE') && ($asset->{$field->db_column_name()}!='')) + {{ \App\Helpers\Helper::gracefulDecrypt($field, \App\Helpers\Helper::getFormattedDateObject($asset->{$field->db_column_name()}, 'date', false)) }} @else {{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }} @endif @@ -452,6 +454,8 @@ @else @if (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) {{ $asset->{$field->db_column_name()} }} + @elseif (($field->format=='DATE') && ($asset->{$field->db_column_name()}!='')) + {{ \App\Helpers\Helper::getFormattedDateObject($asset->{$field->db_column_name()}, 'date', false) }} @else {!! nl2br(e($asset->{$field->db_column_name()})) !!}   @endif