From dc836895531a3157ff9fea12ca6c29e1f46cf3af Mon Sep 17 00:00:00 2001 From: akemidx Date: Thu, 7 Dec 2023 17:50:25 -0500 Subject: [PATCH 1/3] changing log level from ERROR to LOG --- app/Helpers/Helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 800a2491d4..b015f988b3 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -354,7 +354,7 @@ class Helper if ($index >= $total_colors) { - \Log::error('Status label count is '.$index.' and exceeds the allowed count of 266.'); + \Log::log('Status label count is '.$index.' and exceeds the allowed count of 266.'); //patch fix for array key overflow (color count starts at 1, array starts at 0) $index = $index - $total_colors - 1; From f112e31b46b1b1e514878c5ce0105c508ef761f3 Mon Sep 17 00:00:00 2001 From: akemidx Date: Thu, 7 Dec 2023 17:56:10 -0500 Subject: [PATCH 2/3] changing log level from ERROR to LOG --- app/Helpers/Helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index b015f988b3..c7aa5af04a 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -354,7 +354,7 @@ class Helper if ($index >= $total_colors) { - \Log::log('Status label count is '.$index.' and exceeds the allowed count of 266.'); + \Log::info('Status label count is '.$index.' and exceeds the allowed count of 266.'); //patch fix for array key overflow (color count starts at 1, array starts at 0) $index = $index - $total_colors - 1; From 456e6979f0011fd1f6c81faaf6407998acd7c8e8 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 12 Dec 2023 00:12:06 +0000 Subject: [PATCH 3/3] Updated import icons Signed-off-by: snipe --- resources/lang/en/general.php | 1 + resources/views/layouts/default.blade.php | 2 +- resources/views/livewire/importer.blade.php | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 7ee5ca1029..023e9c052c 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -156,6 +156,7 @@ return [ 'image_filetypes_help' => 'Accepted filetypes are jpg, webp, png, gif, and svg. Max upload size allowed is :size.', 'unaccepted_image_type' => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.', 'import' => 'Import', + 'import_this_file' => 'Map fields and process this file', 'importing' => 'Importing', 'importing_help' => 'You can import assets, accessories, licenses, components, consumables, and users via CSV file.

The CSV should be comma-delimited and formatted with headers that match the ones in the sample CSVs in the documentation.', 'import-history' => 'Import History', diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index 3fe1b3845e..90e20d5d9d 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -624,7 +624,7 @@ @can('import') - + {{ trans('general.import') }} diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php index 7bc88a88aa..976d1ffdde 100644 --- a/resources/views/livewire/importer.blade.php +++ b/resources/views/livewire/importer.blade.php @@ -129,8 +129,8 @@ {{ Helper::getFormattedDateObject($currentFile->created_at, 'datetime', false) }} {{ Helper::formatFilesizeUnits($currentFile->filesize) }} -