From 9cc74caa9e7fa4a1ff850c3e93aee4c76f34cb8a Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 29 Mar 2023 10:58:25 -0700 Subject: [PATCH 1/7] Add wire:model to import form checkboxes --- resources/views/livewire/importer.blade.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php index a7b9c3e51c..fbe5802d28 100644 --- a/resources/views/livewire/importer.blade.php +++ b/resources/views/livewire/importer.blade.php @@ -160,22 +160,22 @@
-
-
-
@@ -379,4 +379,4 @@ });}) -@endpush \ No newline at end of file +@endpush From 4cbe683a1a1e7d2d0ea27f4335380613491a9bcb Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 29 Mar 2023 11:28:04 -0700 Subject: [PATCH 2/7] Explicitly cast asset tag to string when querying --- app/Importer/AssetImporter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Importer/AssetImporter.php b/app/Importer/AssetImporter.php index bf47c73608..0fcbf1166c 100644 --- a/app/Importer/AssetImporter.php +++ b/app/Importer/AssetImporter.php @@ -60,7 +60,7 @@ class AssetImporter extends ItemImporter $asset_tag = Asset::autoincrement_asset(); } - $asset = Asset::where(['asset_tag'=> $asset_tag])->first(); + $asset = Asset::where(['asset_tag'=> (string) $asset_tag])->first(); if ($asset) { if (! $this->updating) { $this->log('A matching Asset '.$asset_tag.' already exists'); From e05546d1fa242320c5177da0733d6aa277fe1d76 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 29 Mar 2023 13:23:45 -0700 Subject: [PATCH 3/7] Display helpful messages when importing assets --- app/Http/Livewire/Importer.php | 4 ++++ resources/views/livewire/importer.blade.php | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/Http/Livewire/Importer.php b/app/Http/Livewire/Importer.php index 784d3b2982..1026a188b3 100644 --- a/app/Http/Livewire/Importer.php +++ b/app/Http/Livewire/Importer.php @@ -3,6 +3,7 @@ namespace App\Http\Livewire; use App\Models\CustomField; +use Illuminate\Support\Facades\Auth; use Livewire\Component; use App\Models\Import; @@ -16,6 +17,8 @@ class Importer extends Component { use AuthorizesRequests; + public bool $userIsSuperUser; + public $files; public $progress; //upload progress - '-1' means don't show @@ -250,6 +253,7 @@ class Importer extends Component public function mount() { $this->authorize('import'); + $this->userIsSuperUser = Auth::user()->isSuperUser(); $this->progress = -1; // '-1' means 'don't show the progressbar' $this->progress_bar_class = 'progress-bar-warning'; \Log::debug("Hey, we are calling MOUNT (in the importer-file) !!!!!!!!"); //fcuk diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php index fbe5802d28..22663bc503 100644 --- a/resources/views/livewire/importer.blade.php +++ b/resources/views/livewire/importer.blade.php @@ -156,6 +156,11 @@ 'data-minimum-results-for-search' => '-1', // Remove this if the list gets long enough that we need to search 'data-livewire-component' => $_instance->id ]) }} + @if ($activeFile->import_type === 'asset' && $snipeSettings->auto_increment_assets == 0) + + Generating auto-incrementing asset tags is @if ($userIsSuperUser)disabled @else disabled @endif so all rows need to have the "Asset Tag" column populated. + + @endif @@ -163,6 +168,11 @@ @@ -344,7 +354,7 @@ 'import-update': !!@this.update, 'send-welcome': !!@this.send_welcome, 'import-type': @this.activeFile.import_type, - 'run-backup': !!@this.run_backup, + 'A': !!@this.run_backup, 'column-mappings': mappings }), headers: { From 863a346d6e1474921b96840cc4302105ace42675 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 29 Mar 2023 13:37:14 -0700 Subject: [PATCH 4/7] Translate strings --- resources/lang/en/general.php | 2 ++ resources/views/livewire/importer.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 99fa3bd304..aa2e85c2fe 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -422,6 +422,8 @@ return [ 'merged_log_this_user_from' => 'Merged user ID :from_id (:from_username) into this user (ID :to_id - :to_username)', 'clear_and_save' => 'Clear & Save', 'update_existing_values' => 'Update Existing Values?', + 'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generating auto-incrementing asset tags is disabled so all rows need to have the "Asset Tag" column populated.', + 'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Note: Generating auto-incrementing asset tags is enabled so assets will be created for rows that do not have "Asset Tag" populated. Rows that do have "Asset Tag" populated will be updated with the provided information.', 'send_welcome_email_to_users' => ' Send Welcome Email for new Users?', 'back_before_importing' => 'Backup before importing?', 'csv_header_field' => 'CSV Header Field', diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php index 22663bc503..033c231453 100644 --- a/resources/views/livewire/importer.blade.php +++ b/resources/views/livewire/importer.blade.php @@ -158,7 +158,7 @@ ]) }} @if ($activeFile->import_type === 'asset' && $snipeSettings->auto_increment_assets == 0) - Generating auto-incrementing asset tags is @if ($userIsSuperUser)disabled @else disabled @endif so all rows need to have the "Asset Tag" column populated. + {{ trans('general.auto_incrementing_asset_tags_disabled_so_tags_required') }} @endif @@ -170,7 +170,7 @@ {{ trans('general.update_existing_values') }} @if ($activeFile->import_type === 'asset' && $snipeSettings->auto_increment_assets == 1 && $update) - Note: Generating auto-incrementing asset tags is @if ($userIsSuperUser)disabled @else enabled @endif so assets will be created for rows that do not have "Asset Tag" populated. Rows that do have "Asset Tag" populated will be updated with the provided information. + {{ trans('general.auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created') }} @endif From 9f8b8f6cc1be08ff1887df492ecfced93578cdf0 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 29 Mar 2023 16:58:55 -0700 Subject: [PATCH 5/7] Remove unneeded variable --- app/Http/Livewire/Importer.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/Http/Livewire/Importer.php b/app/Http/Livewire/Importer.php index 1026a188b3..88c07cb793 100644 --- a/app/Http/Livewire/Importer.php +++ b/app/Http/Livewire/Importer.php @@ -17,8 +17,6 @@ class Importer extends Component { use AuthorizesRequests; - public bool $userIsSuperUser; - public $files; public $progress; //upload progress - '-1' means don't show @@ -253,7 +251,6 @@ class Importer extends Component public function mount() { $this->authorize('import'); - $this->userIsSuperUser = Auth::user()->isSuperUser(); $this->progress = -1; // '-1' means 'don't show the progressbar' $this->progress_bar_class = 'progress-bar-warning'; \Log::debug("Hey, we are calling MOUNT (in the importer-file) !!!!!!!!"); //fcuk From 0998c70a92f3ea056380283d88285dfb9f36bbab Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 29 Mar 2023 16:59:26 -0700 Subject: [PATCH 6/7] Remove unneeded import --- app/Http/Livewire/Importer.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Livewire/Importer.php b/app/Http/Livewire/Importer.php index 88c07cb793..784d3b2982 100644 --- a/app/Http/Livewire/Importer.php +++ b/app/Http/Livewire/Importer.php @@ -3,7 +3,6 @@ namespace App\Http\Livewire; use App\Models\CustomField; -use Illuminate\Support\Facades\Auth; use Livewire\Component; use App\Models\Import; From 6beb3b551ac4101df69e3fc98b677ff4eef86760 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 29 Mar 2023 17:01:24 -0700 Subject: [PATCH 7/7] Fix typo --- resources/views/livewire/importer.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php index 033c231453..8c4b8f8806 100644 --- a/resources/views/livewire/importer.blade.php +++ b/resources/views/livewire/importer.blade.php @@ -354,7 +354,7 @@ 'import-update': !!@this.update, 'send-welcome': !!@this.send_welcome, 'import-type': @this.activeFile.import_type, - 'A': !!@this.run_backup, + 'run-backup': !!@this.run_backup, 'column-mappings': mappings }), headers: {