From 46a6a84ecbbb59c5428896cb98e93290f7c24a64 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 6 Aug 2024 11:07:39 -0700 Subject: [PATCH 1/3] adds migration and translations --- ...dd_shortcuts_enabled_to_settings_table.php | 27 +++++++++++++++++++ .../lang/en-US/admin/settings/general.php | 2 ++ resources/views/settings/general.blade.php | 15 +++++++++++ 3 files changed, 44 insertions(+) create mode 100644 database/migrations/2024_08_06_175114_add_shortcuts_enabled_to_settings_table.php diff --git a/database/migrations/2024_08_06_175114_add_shortcuts_enabled_to_settings_table.php b/database/migrations/2024_08_06_175114_add_shortcuts_enabled_to_settings_table.php new file mode 100644 index 0000000000..1d38c6b891 --- /dev/null +++ b/database/migrations/2024_08_06_175114_add_shortcuts_enabled_to_settings_table.php @@ -0,0 +1,27 @@ +boolean('shortcuts_enabled')->default(false); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('settings', function (Blueprint $table) { + $table->dropColumn('shortcuts_enabled'); + }); + } +}; diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php index 9ba69ef22a..31165cf3f0 100644 --- a/resources/lang/en-US/admin/settings/general.php +++ b/resources/lang/en-US/admin/settings/general.php @@ -218,6 +218,8 @@ return [ 'webhook_integration_help' => ':app integration is optional, however the endpoint and channel are required if you wish to use it. To configure :app integration, you must first create an incoming webhook on your :app account. Click on the Test :app Integration button to confirm your settings are correct before saving. ', 'webhook_integration_help_button' => 'Once you have saved your :app information, a test button will appear.', 'webhook_test_help' => 'Test whether your :app integration is configured correctly. YOU MUST SAVE YOUR UPDATED :app SETTINGS FIRST.', + 'shortcuts_enabled' => 'Enable Shortcuts', + 'shortcuts_help_text' => 'Windows: Alt + Access key, Mac: Control + Option + Access key', 'snipe_version' => 'Snipe-IT version', 'support_footer' => 'Support Footer Links ', 'support_footer_help' => 'Specify who sees the links to the Snipe-IT Support info and Users Manual', diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php index 91d3b1c56f..379822314c 100644 --- a/resources/views/settings/general.blade.php +++ b/resources/views/settings/general.blade.php @@ -163,6 +163,21 @@ + +
+
+ {{ trans('admin/settings/general.shortcuts_enabled') }} +
+
+ + {!! $errors->first('shortcuts_enabled', '') !!} +

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

+
+
+
From 6b1784f2ee88d2a0fd616d5bc9a5b37d89af4ffe Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 7 Aug 2024 10:47:16 -0700 Subject: [PATCH 2/3] makes shortcuts optional --- app/Http/Controllers/SettingsController.php | 1 + resources/views/accessories/index.blade.php | 2 +- resources/views/components/index.blade.php | 2 +- resources/views/consumables/index.blade.php | 2 +- resources/views/hardware/index.blade.php | 2 +- resources/views/layouts/default.blade.php | 12 ++++++------ .../views/partials/asset-bulk-actions.blade.php | 2 +- resources/views/partials/forms/edit/submit.blade.php | 2 +- resources/views/settings/general.blade.php | 2 +- resources/views/users/index.blade.php | 2 +- 10 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 9c7392560d..e58647d72c 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -324,6 +324,7 @@ class SettingsController extends Controller $setting->full_multiple_companies_support = $request->input('full_multiple_companies_support', '0'); $setting->unique_serial = $request->input('unique_serial', '0'); + $setting->shortcuts_enabled = $request->input('shortcuts_enabled', '0'); $setting->show_images_in_email = $request->input('show_images_in_email', '0'); $setting->show_archived_in_list = $request->input('show_archived_in_list', '0'); $setting->dashboard_message = $request->input('dashboard_message'); diff --git a/resources/views/accessories/index.blade.php b/resources/views/accessories/index.blade.php index 3b82bfdb63..611fc8a34b 100755 --- a/resources/views/accessories/index.blade.php +++ b/resources/views/accessories/index.blade.php @@ -8,7 +8,7 @@ @section('header_right') @can('create', \App\Models\Accessory::class) - {{ trans('general.create') }} + shortcuts_enabled == 1 ? "accesskey=n" : ''}} class="btn btn-primary pull-right"> {{ trans('general.create') }} @endcan @stop diff --git a/resources/views/components/index.blade.php b/resources/views/components/index.blade.php index 0442b5de06..418852095b 100644 --- a/resources/views/components/index.blade.php +++ b/resources/views/components/index.blade.php @@ -8,7 +8,7 @@ @section('header_right') @can('create', \App\Models\Component::class) - {{ trans('general.create') }} + shortcuts_enabled == 1 ? "accesskey=n" : ''}} class="btn btn-primary pull-right"> {{ trans('general.create') }} @endcan @stop diff --git a/resources/views/consumables/index.blade.php b/resources/views/consumables/index.blade.php index b654aa884d..e2235e86e3 100644 --- a/resources/views/consumables/index.blade.php +++ b/resources/views/consumables/index.blade.php @@ -8,7 +8,7 @@ @section('header_right') @can('create', \App\Models\Consumable::class) - {{ trans('general.create') }} + shortcuts_enabled == 1 ? "accesskey=n" : ''}} class="btn btn-primary pull-right"> {{ trans('general.create') }} @endcan @stop diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php index 85a82bd40b..3a27849b03 100755 --- a/resources/views/hardware/index.blade.php +++ b/resources/views/hardware/index.blade.php @@ -47,7 +47,7 @@ {{ trans('admin/hardware/general.custom_export') }} @can('create', \App\Models\Asset::class) - {{ trans('general.create') }} + shortcuts_enabled == 1 ? "n" : ''}} class="btn btn-primary pull-right"> {{ trans('general.create') }} @endcan @stop diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index 839d769051..78fd26dfdf 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -144,7 +144,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
{!! $errors->first('shortcuts_enabled', '') !!} diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index 91b9a2a318..28cbc30f70 100755 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -18,7 +18,7 @@ @if ($snipeSettings->ldap_enabled == 1) {{trans('general.ldap_sync')}} @endif - {{ trans('general.create') }} + shortcuts_enabled == 1 ? "n" : ''}} class="btn btn-primary pull-right" style="margin-right: 5px;"> {{ trans('general.create') }} @endcan @if (request('status')=='deleted') From 3a96e501ccaf142a8397c13e396d4f34feb62707 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 7 Aug 2024 10:54:06 -0700 Subject: [PATCH 3/3] use old school input --- resources/views/settings/general.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php index e7242ae2e0..99ed0ddd44 100644 --- a/resources/views/settings/general.blade.php +++ b/resources/views/settings/general.blade.php @@ -170,7 +170,7 @@
{!! $errors->first('shortcuts_enabled', '') !!}