From ce60db009c51c41ce523b0818849528b4701e6a2 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 23 Aug 2023 00:32:43 -0700 Subject: [PATCH 1/7] adds soft deletes to eager loading --- app/Http/Transformers/ActionlogsTransformer.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php index cb28ff8110..e7ac55f523 100644 --- a/app/Http/Transformers/ActionlogsTransformer.php +++ b/app/Http/Transformers/ActionlogsTransformer.php @@ -152,10 +152,10 @@ class ActionlogsTransformer * @return array */ public function changedInfo(array $clean_meta) - { $location = Location::all(); - $company = Company::all(); - $supplier = Supplier::all(); - $model = AssetModel::all(); + { $location = Location::withTrashed()->all(); + $company = Company::withTrashed()->all(); + $supplier = Supplier::withTrashed()->all(); + $model = AssetModel::withTrashed()->get(); if(array_key_exists('rtd_location_id',$clean_meta)) { From 0fc79ec936537b03fd81049b3a955a3d963715da Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 23 Aug 2023 00:40:59 -0700 Subject: [PATCH 2/7] fixes conflicts --- app/Http/Transformers/ActionlogsTransformer.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php index e7ac55f523..99dd0c47e3 100644 --- a/app/Http/Transformers/ActionlogsTransformer.php +++ b/app/Http/Transformers/ActionlogsTransformer.php @@ -151,10 +151,11 @@ class ActionlogsTransformer * @param array $clean_meta * @return array */ - public function changedInfo(array $clean_meta) - { $location = Location::withTrashed()->all(); - $company = Company::withTrashed()->all(); - $supplier = Supplier::withTrashed()->all(); + public function changedInfo(array $clean_meta) { + + $location = Location::withTrashed()->get(); + $company = Company::withTrashed()->get(); + $supplier = Supplier::withTrashed()->get(); $model = AssetModel::withTrashed()->get(); From 5a0b0522b0c2b68d5602a21255e8576c52d52e96 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 24 Aug 2023 08:15:07 -0700 Subject: [PATCH 3/7] Explicitly declare $clean_meta variable --- app/Http/Transformers/ActionlogsTransformer.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php index 0a5910259a..98fc89f786 100644 --- a/app/Http/Transformers/ActionlogsTransformer.php +++ b/app/Http/Transformers/ActionlogsTransformer.php @@ -50,13 +50,15 @@ class ActionlogsTransformer if (($actionlog->log_meta) && ($actionlog->log_meta!='')) { $meta_array = json_decode($actionlog->log_meta); + $clean_meta = []; + if ($meta_array) { foreach ($meta_array as $fieldname => $fieldata) { $clean_meta[$fieldname]['old'] = $this->clean_field($fieldata->old); $clean_meta[$fieldname]['new'] = $this->clean_field($fieldata->new); } - } + $clean_meta= $this->changedInfo($clean_meta); } From e32c07be02aa6c7e9fb33e3b06a965cfd90992a4 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 24 Aug 2023 08:15:40 -0700 Subject: [PATCH 4/7] Clear commented log statements --- app/Http/Transformers/ActionlogsTransformer.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php index 98fc89f786..792874561f 100644 --- a/app/Http/Transformers/ActionlogsTransformer.php +++ b/app/Http/Transformers/ActionlogsTransformer.php @@ -122,9 +122,7 @@ class ActionlogsTransformer 'log_meta' => ((isset($clean_meta)) && (is_array($clean_meta))) ? $clean_meta: null, 'action_date' => ($actionlog->action_date) ? Helper::getFormattedDateObject($actionlog->action_date, 'datetime'): Helper::getFormattedDateObject($actionlog->created_at, 'datetime'), ]; - //\Log::info("Clean Meta is: ".print_r($clean_meta,true)); - //dd($array); return $array; } From 844fe0938ce508d78001ca49f508cef90be79316 Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 26 Aug 2023 17:42:56 +0100 Subject: [PATCH 5/7] Added link to the help docs Signed-off-by: snipe --- resources/lang/en/admin/settings/general.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php index a3b64996d5..0516bb6a83 100644 --- a/resources/lang/en/admin/settings/general.php +++ b/resources/lang/en/admin/settings/general.php @@ -349,7 +349,7 @@ return [ 'label2_fields_help' => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.', 'help_asterisk_bold' => 'Text entered as **text** will be displayed as bold', 'help_blank_to_use' => 'Leave blank to use the value from :setting_name', - 'help_default_will_use' => ':default will use the value from :setting_name', + 'help_default_will_use' => ':default will use the value from :setting_name.
Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see the documentation for more details. ', 'default' => 'Default', 'none' => 'None', 'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization's Google developer console .', From 20e9f05a644a572cfbc9635f016af1fd310ab7bf Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 26 Aug 2023 17:43:02 +0100 Subject: [PATCH 6/7] Tighter layout Signed-off-by: snipe --- resources/views/settings/labels.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index d23ff8ef2c..46ce4fe610 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -106,7 +106,7 @@
{{ Form::label('label2_title', trans('admin/settings/general.label2_title'), ['class'=>'control-label']) }}
-
+
{{ Form::text('label2_title', old('label2_title', $setting->label2_title), [ 'class'=>'form-control', 'placeholder'=>$setting->qr_text, 'aria-label'=>'label2_title' ]) }} {!! $errors->first('label2_title', '') !!}

{!! trans('admin/settings/general.label2_title_help') !!}

@@ -142,7 +142,7 @@
{{ Form::label('label2_1d_type', trans('admin/settings/general.label2_1d_type'), ['class'=>'control-label']) }}
-
+
@php $select1DValues = [ 'default' => trans('admin/settings/general.default').' [ '.$setting->alt_barcode.' ]', @@ -174,7 +174,7 @@
{{ Form::label('label2_2d_type', trans('admin/settings/general.label2_2d_type'), ['class'=>'control-label']) }}
-
+
@php $select2DValues = [ 'default' => trans('admin/settings/general.default').' [ '.$setting->barcode_type.' ]', From 582cad2dc5753b526b7eae533ea1b54493906739 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 28 Aug 2023 12:37:42 +0100 Subject: [PATCH 7/7] =?UTF-8?q?Fixed=20#13521=20-=20make=20modal=20?= =?UTF-8?q?=E2=80=9Cselect=20files=E2=80=9D=20button=20wider?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: snipe --- resources/views/modals/upload-file.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/modals/upload-file.blade.php b/resources/views/modals/upload-file.blade.php index 09c53751ce..c5816bf175 100644 --- a/resources/views/modals/upload-file.blade.php +++ b/resources/views/modals/upload-file.blade.php @@ -15,15 +15,15 @@
-
+
-
-
+