From 33de45d8fb37d8dbcd2a082b42248e3bb3b6d1e6 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 29 Jul 2022 00:57:20 -0700 Subject: [PATCH 1/2] Swirtched to conditionally adding the nbsp; that the table needs for proper layout if cell is empty Signed-off-by: snipe --- resources/views/hardware/view.blade.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 9b5e20dc56..4ebdfd7f57 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -472,10 +472,14 @@ @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()})) !!}   + {!! nl2br(e($asset->{$field->db_column_name()})) !!} @endif @endif + + @if ($asset->{$field->db_column_name()}=='') +   + @endif @endforeach From 8b30992a11e819f9e29a5682672467c1d21300f3 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 1 Aug 2022 14:06:18 -0700 Subject: [PATCH 2/2] Added bulk edit to company view Signed-off-by: snipe --- resources/views/companies/view.blade.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/views/companies/view.blade.php b/resources/views/companies/view.blade.php index 4324f3f78e..ffa5815b64 100644 --- a/resources/views/companies/view.blade.php +++ b/resources/views/companies/view.blade.php @@ -86,7 +86,9 @@
-
+
+ @include('partials.asset-bulk-actions') +