From 4fd43799b47da14303a8fc4f65033a89f0a59aab Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 4 Dec 2023 10:56:03 -0800 Subject: [PATCH 1/4] missed one view --- resources/views/account/view-assets.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 7481e64c4b..54440d9242 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -491,7 +491,7 @@ {{ trans('general.name') }} - {{ trans('admin/hardware/form.serial') }} + {{ trans('admin/licenses/form.license_key') }} {{ trans('general.category') }} From 7258af20fc219d20e2239389da0fdbe8e0c565fc Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 5 Dec 2023 14:40:49 +0000 Subject: [PATCH 2/4] Added help text to RTD location field Signed-off-by: snipe --- resources/lang/en/general.php | 1 + resources/views/hardware/edit.blade.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 1f2f4322cc..34768b217a 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -492,5 +492,6 @@ return [ 'copy_to_clipboard' => 'Copy to Clipboard', 'copied' => 'Copied!', 'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.', + 'rtd_location_help' => 'This is the location of the asset when it is not checked out', ]; diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index aff215ae26..4c1c1457b6 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -65,7 +65,7 @@ @endif @include ('partials.forms.edit.notes') - @include ('partials.forms.edit.location-select', ['translated_name' => trans('admin/hardware/form.default_location'), 'fieldname' => 'rtd_location_id']) + @include ('partials.forms.edit.location-select', ['translated_name' => trans('admin/hardware/form.default_location'), 'fieldname' => 'rtd_location_id', 'help_text' => trans('general.rtd_location_help')]) @include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/hardware/general.requestable')]) From a0de9eb343822b4b98cce197254bc67bb657ea57 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 5 Dec 2023 15:00:04 +0000 Subject: [PATCH 3/4] Updated to alpine 3.18.5 Signed-off-by: snipe --- Dockerfile.alpine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 62a928f8ad..689a65ed44 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM alpine:3.17.3 +FROM alpine:3.18.5 # Apache + PHP RUN apk add --no-cache \ apache2 \ From 6bd351c5d8917f9728ec89a0b2bbf5fa94b96b8b Mon Sep 17 00:00:00 2001 From: Brady Wetherington Date: Thu, 7 Dec 2023 14:08:15 +0000 Subject: [PATCH 4/4] Whoops, didn't even add changes - duh --- app/Console/Commands/RestoreFromBackup.php | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/Console/Commands/RestoreFromBackup.php b/app/Console/Commands/RestoreFromBackup.php index a1a18634cc..7108568c5c 100644 --- a/app/Console/Commands/RestoreFromBackup.php +++ b/app/Console/Commands/RestoreFromBackup.php @@ -84,36 +84,36 @@ class RestoreFromBackup extends Command $private_dirs = [ + 'storage/private_uploads/accessories', + 'storage/private_uploads/assetmodels', 'storage/private_uploads/assets', // these are asset _files_, not the pictures. 'storage/private_uploads/audits', + 'storage/private_uploads/components', + 'storage/private_uploads/consumables', + 'storage/private_uploads/eula-pdfs', 'storage/private_uploads/imports', - 'storage/private_uploads/assetmodels', - 'storage/private_uploads/users', 'storage/private_uploads/licenses', 'storage/private_uploads/signatures', - 'storage/private_uploads/eula-pdfs', + 'storage/private_uploads/users', ]; $private_files = [ 'storage/oauth-private.key', 'storage/oauth-public.key', ]; $public_dirs = [ + 'public/uploads/accessories', + 'public/uploads/assets', // these are asset _pictures_, not asset files + 'public/uploads/avatars', + //'public/uploads/barcodes', // we don't want this, let the barcodes be regenerated + 'public/uploads/categories', 'public/uploads/companies', 'public/uploads/components', - 'public/uploads/categories', - 'public/uploads/manufacturers', - //'public/uploads/barcodes', // we don't want this, let the barcodes be regenerated 'public/uploads/consumables', 'public/uploads/departments', - 'public/uploads/avatars', - 'public/uploads/suppliers', - 'public/uploads/assets', // these are asset _pictures_, not asset files 'public/uploads/locations', - 'public/uploads/accessories', - 'public/uploads/models', - 'public/uploads/categories', - 'public/uploads/avatars', 'public/uploads/manufacturers', + 'public/uploads/models', + 'public/uploads/suppliers', ]; $public_files = [