DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge pull request #10805 from inietov/fixes/date_localization_not_working_custom_fields_develop

Browse source 
Fixes #8143 Date localization not work in custom fields for develop branch
This commit is contained in:
snipe 2022-03-08 16:36:31 -08:00 committed by GitHub
parent 9311584f43 657cfddd3c
commit 95d6e1a402
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/views/hardware/view.blade.php
View file

@ -442,6 +442,8 @@
@can('superuser') @can('superuser')
@if (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) @if (($field->format=='URL') && ($asset->{$field->db_column_name()}!=''))
<a href="{{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}" target="_new">{{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}</a> <a href="{{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}" target="_new">{{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}</a>
@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 @else
{{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }} {{ Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }}
@endif @endif
@ -452,6 +454,8 @@
@else @else
@if (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) @if (($field->format=='URL') && ($asset->{$field->db_column_name()}!=''))
<a href="{{ $asset->{$field->db_column_name()} }}" target="_new">{{ $asset->{$field->db_column_name()} }}</a> <a href="{{ $asset->{$field->db_column_name()} }}" target="_new">{{ $asset->{$field->db_column_name()} }}</a>
@elseif (($field->format=='DATE') && ($asset->{$field->db_column_name()}!=''))
{{ \App\Helpers\Helper::getFormattedDateObject($asset->{$field->db_column_name()}, 'date', false) }}
@else @else
{!! nl2br(e($asset->{$field->db_column_name()})) !!} &nbsp; {!! nl2br(e($asset->{$field->db_column_name()})) !!} &nbsp;
@endif @endif