From d06e5f25b00b119d583bcc31efe7f57c090015b4 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 23 May 2024 11:51:08 -0700
Subject: [PATCH 01/12] Remove old trait from test

---
 tests/Feature/Settings/BrandingSettingsTest.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/Feature/Settings/BrandingSettingsTest.php b/tests/Feature/Settings/BrandingSettingsTest.php
index ef98d85593..a27a5d1ef8 100644
--- a/tests/Feature/Settings/BrandingSettingsTest.php
+++ b/tests/Feature/Settings/BrandingSettingsTest.php
@@ -3,13 +3,10 @@
 namespace Tests\Feature\Settings;
 
 use App\Models\User;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class BrandingSettingsTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testSiteNameIsRequired()
     {
         $this->actingAs(User::factory()->superuser()->create())

From ef95ede83329786f1db5ae9988f1bd6746ab8e21 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 23 May 2024 12:32:34 -0700
Subject: [PATCH 02/12] Add Install Passport step

---
 .github/workflows/tests-sqlite.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/tests-sqlite.yml b/.github/workflows/tests-sqlite.yml
index 405dc92134..2bfd4b5f1f 100644
--- a/.github/workflows/tests-sqlite.yml
+++ b/.github/workflows/tests-sqlite.yml
@@ -49,6 +49,9 @@ jobs:
       - name: Generate key
         run: php artisan key:generate
 
+      - name: Install Passport
+        run: php artisan passport:install
+
       - name: Directory Permissions
         run: chmod -R 777 storage bootstrap/cache
 

From a130033480e72bd352721a40273fcebf89ca8d7c Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 23 May 2024 12:45:38 -0700
Subject: [PATCH 03/12] Revert "Add Install Passport step"

This reverts commit ef95ede83329786f1db5ae9988f1bd6746ab8e21.
---
 .github/workflows/tests-sqlite.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/tests-sqlite.yml b/.github/workflows/tests-sqlite.yml
index 2bfd4b5f1f..405dc92134 100644
--- a/.github/workflows/tests-sqlite.yml
+++ b/.github/workflows/tests-sqlite.yml
@@ -49,9 +49,6 @@ jobs:
       - name: Generate key
         run: php artisan key:generate
 
-      - name: Install Passport
-        run: php artisan passport:install
-
       - name: Directory Permissions
         run: chmod -R 777 storage bootstrap/cache
 

From 51f72daba104b7f9a6d1918e391309e5c377bdd4 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 23 May 2024 13:55:03 -0700
Subject: [PATCH 04/12] Debugging step

---
 .github/workflows/tests-sqlite.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests-sqlite.yml b/.github/workflows/tests-sqlite.yml
index 405dc92134..df06089204 100644
--- a/.github/workflows/tests-sqlite.yml
+++ b/.github/workflows/tests-sqlite.yml
@@ -46,11 +46,14 @@ jobs:
       - name: Install Dependencies
         run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
+      - name: Directory Permissions
+        run: chmod -R 777 storage bootstrap/cache
+
       - name: Generate key
         run: php artisan key:generate
 
-      - name: Directory Permissions
-        run: chmod -R 777 storage bootstrap/cache
+      - name: Debug Passport
+        run: ls -la storage
 
       - name: Execute tests (Unit and Feature tests) via PHPUnit
         env:

From fa6e170feb01d78aae9039643dceabaa67dce3fe Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 23 May 2024 14:01:06 -0700
Subject: [PATCH 05/12] Install passport

---
 .github/workflows/tests-sqlite.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/tests-sqlite.yml b/.github/workflows/tests-sqlite.yml
index df06089204..230e192f97 100644
--- a/.github/workflows/tests-sqlite.yml
+++ b/.github/workflows/tests-sqlite.yml
@@ -52,6 +52,9 @@ jobs:
       - name: Generate key
         run: php artisan key:generate
 
+      - name: Install Passport
+        run: php artisan passport:install
+
       - name: Debug Passport
         run: ls -la storage
 

From 4ce86a061fd1ecc47dd794c0d341cb382ae26099 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 23 May 2024 15:43:59 -0700
Subject: [PATCH 06/12] Set DB_CONNECTION

---
 .github/workflows/tests-sqlite.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/tests-sqlite.yml b/.github/workflows/tests-sqlite.yml
index 230e192f97..fcad5ae989 100644
--- a/.github/workflows/tests-sqlite.yml
+++ b/.github/workflows/tests-sqlite.yml
@@ -53,6 +53,8 @@ jobs:
         run: php artisan key:generate
 
       - name: Install Passport
+        env:
+          DB_CONNECTION: sqlite_testing
         run: php artisan passport:install
 
       - name: Debug Passport

From e03b5754a8629909306fc5d8dd3a83e75550b7af Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 23 May 2024 15:54:32 -0700
Subject: [PATCH 07/12] Combine steps

---
 .github/workflows/tests-sqlite.yml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/tests-sqlite.yml b/.github/workflows/tests-sqlite.yml
index fcad5ae989..85817319ef 100644
--- a/.github/workflows/tests-sqlite.yml
+++ b/.github/workflows/tests-sqlite.yml
@@ -46,19 +46,14 @@ jobs:
       - name: Install Dependencies
         run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
-      - name: Directory Permissions
-        run: chmod -R 777 storage bootstrap/cache
-
-      - name: Generate key
-        run: php artisan key:generate
-
-      - name: Install Passport
+      - name: Setup Laravel
         env:
           DB_CONNECTION: sqlite_testing
-        run: php artisan passport:install
-
-      - name: Debug Passport
-        run: ls -la storage
+        run: |
+          php artisan key:generate
+          php artisan migrate --force
+          php artisan passport:install
+          chmod -R 777 storage bootstrap/cache
 
       - name: Execute tests (Unit and Feature tests) via PHPUnit
         env:

From 639cbf6d53e92ca1706088b521ad236af76a4fbe Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 23 May 2024 15:56:58 -0700
Subject: [PATCH 08/12] Remove passport:install command

---
 .github/workflows/tests-sqlite.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/tests-sqlite.yml b/.github/workflows/tests-sqlite.yml
index 85817319ef..ec2ef8b783 100644
--- a/.github/workflows/tests-sqlite.yml
+++ b/.github/workflows/tests-sqlite.yml
@@ -52,7 +52,6 @@ jobs:
         run: |
           php artisan key:generate
           php artisan migrate --force
-          php artisan passport:install
           chmod -R 777 storage bootstrap/cache
 
       - name: Execute tests (Unit and Feature tests) via PHPUnit

From c3cf123189213eee62e5797e5c488b9ec681fbf9 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 25 May 2024 10:39:47 +0100
Subject: [PATCH 09/12] Better translation for custom fields

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en-US/general.php          |  2 ++
 resources/views/layouts/default.blade.php | 11 +++++------
 resources/views/reports/custom.blade.php  |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index 7ee1557c51..66100dd09f 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -500,6 +500,8 @@ return [
         'address2' => 'Address Line 2',
         'import_note' => 'Imported using csv importer',
     ],
+    'remove_customfield_association' => 'Remove this field from the fieldset. This will not delete the custom field, only this field\'s association with this fieldset.',
+    'checked_out_to_fields' => 'Checked Out To Fields',
     'percent_complete' => '% complete',
     'uploading' => 'Uploading... ',
     'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 523d76b355..2b7ae31afc 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -738,7 +738,11 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                                             {{ trans('general.activity_report') }}
                                         </a>
                                     </li>
-
+                                    <li>
+                                        <a href="{{ url('reports/custom') }}" {{ (Request::is('reports/custom') ? ' class="active"' : '') }}>
+                                            {{ trans('general.custom_report') }}
+                                        </a>
+                                    </li>
                                     <li>
                                         <a href="{{ route('reports.audit') }}" {{ (Request::is('reports.audit') ? ' class="active"' : '') }}>
                                             {{ trans('general.audit_report') }}</a>
@@ -768,11 +772,6 @@ dir="{{ in_array(app()->getLocale(),['ar-SA','fa-IR', 'he-IL']) ? 'rtl' : 'ltr'
                                             {{ trans('general.accessory_report') }}
                                         </a>
                                     </li>
-                                    <li>
-                                        <a href="{{ url('reports/custom') }}" {{ (Request::is('reports/custom') ? ' class="active"' : '') }}>
-                                            {{ trans('general.custom_report') }}
-                                        </a>
-                                    </li>
                                 </ul>
                             </li>
                         @endcan
diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 7a1f522e49..ebc212b5c7 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -189,7 +189,7 @@
 
             <!-- User fields -->
 
-              <h2>{{ trans('general.checked_out_to') }} {{ trans('general.fields') }}:</h2>
+              <h2>{{ trans('general.checked_out_to_fields') }}: </h2>
 
               <label class="form-control">
                 {{ Form::checkbox('assigned_to', '1', '1') }}

From b54c1caa7468d838294a32eb67112fd2aa4032ef Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 25 May 2024 10:43:28 +0100
Subject: [PATCH 10/12] Improved translation

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en-US/general.php                   | 2 +-
 resources/views/partials/bootstrap-table.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index 66100dd09f..542e41ec35 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -398,7 +398,7 @@ return [
     'accessory_name'       => 'Accessory Name:',
     'clone_item'            => 'Clone Item',
     'checkout_tooltip' => 'Check this item out',
-    'checkin_tooltip' => 'Check this item in',
+    'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
     'checkout_user_tooltip' => 'Check this item out to a user',
     'maintenance_mode'      => 'The service is temporarily unavailable for system updates. Please check back later.',
     'maintenance_mode_title' => 'System Temporarily Unavailable',
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 8b01ce7865..151aaee3a4 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -459,7 +459,7 @@
             // The user is allowed to check items in
             } else if (row.available_actions.checkin == true)  {
                 if (row.assigned_to) {
-                    return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="Check this item in so it is available for re-imaging, re-issue, etc.">{{ trans('general.checkin') }}</a>';
+                    return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="{{ trans('general.checkin_tooltip') }}">{{ trans('general.checkin') }}</a>';
                 } else if (row.assigned_pivot_id) {
                     return '<a href="{{ config('app.url') }}/' + destination + '/' + row.assigned_pivot_id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="Check this item in so it is available for re-imaging, re-issue, etc.">{{ trans('general.checkin') }}</a>';
                 }

From ad7b291062ee2fc353b5f9bb03048f0aca30ba9f Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 25 May 2024 10:55:48 +0100
Subject: [PATCH 11/12] Added translations

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en-US/general.php                   | 2 ++
 resources/views/hardware/checkin.blade.php         | 2 +-
 resources/views/partials/bootstrap-table.blade.php | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index 542e41ec35..7e0c0bdea3 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -241,6 +241,7 @@ return [
     'requested_assets'      => 'Requested Assets',
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Request Canceled',
+    'request_item'          => 'Request this item',
     'save'  				=> 'Save',
     'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Select',
@@ -400,6 +401,7 @@ return [
     'checkout_tooltip' => 'Check this item out',
     'checkin_tooltip' => 'Check this item in so that it is available for re-issue, re-imaging, etc',
     'checkout_user_tooltip' => 'Check this item out to a user',
+    'checkin_to_diff_location' => 'You can choose to check this asset in to a location other than this asset\'s default location of :default_location if one is set',
     'maintenance_mode'      => 'The service is temporarily unavailable for system updates. Please check back later.',
     'maintenance_mode_title' => 'System Temporarily Unavailable',
     'ldap_import'           => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
index dd6237b1bd..c41ef474db 100755
--- a/resources/views/hardware/checkin.blade.php
+++ b/resources/views/hardware/checkin.blade.php
@@ -73,7 +73,7 @@
                       </div>
                     </div>
 
-                  @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id', 'help_text' => ($asset->defaultLoc) ? 'You can choose to check this asset in to a location other than the default location of '.$asset->defaultLoc->name.' if one is set.' : null, 'hide_location_radio' => true])
+                  @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id', 'help_text' => ($asset->defaultLoc) ? trans('general.checkin_to_diff_location', ['default_location' => $asset->defaultLoc->name]) : null, 'hide_location_radio' => true])
 
                   <!-- Checkout/Checkin Date -->
                     <div class="form-group{{ $errors->has('checkin_at') ? ' has-error' : '' }}">
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 151aaee3a4..046c6a2a4b 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -461,7 +461,7 @@
                 if (row.assigned_to) {
                     return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="{{ trans('general.checkin_tooltip') }}">{{ trans('general.checkin') }}</a>';
                 } else if (row.assigned_pivot_id) {
-                    return '<a href="{{ config('app.url') }}/' + destination + '/' + row.assigned_pivot_id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="Check this item in so it is available for re-imaging, re-issue, etc.">{{ trans('general.checkin') }}</a>';
+                    return '<a href="{{ config('app.url') }}/' + destination + '/' + row.assigned_pivot_id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="{{ trans('general.checkin_tooltip') }}">{{ trans('general.checkin') }}</a>';
                 }
 
             }
@@ -479,7 +479,7 @@
         } else if (value.available_actions.cancel == true)  {
             return '<form action="{{ config('app.url') }}/account/request-asset/'+ value.id + '" method="POST">@csrf<button class="btn btn-danger btn-sm" data-tooltip="true" title="Cancel this item request">{{ trans('button.cancel') }}</button></form>';
         } else if (value.available_actions.request == true)  {
-            return '<form action="{{ config('app.url') }}/account/request-asset/'+ value.id + '" method="POST">@csrf<button class="btn btn-primary btn-sm" data-tooltip="true" title="Request this item">{{ trans('button.request') }}</button></form>';
+            return '<form action="{{ config('app.url') }}/account/request-asset/'+ value.id + '" method="POST">@csrf<button class="btn btn-primary btn-sm" data-tooltip="true" title="{{ trans('general.request_item') }}">{{ trans('button.request') }}</button></form>';
         }
 
     }

From dc5e15f9196c663b64b9a25b0ed4ab3db8c50257 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 25 May 2024 11:02:07 +0100
Subject: [PATCH 12/12] Added translation for external link

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en-US/general.php                   | 1 +
 resources/views/partials/bootstrap-table.blade.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index 7e0c0bdea3..6c8c0f4afe 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -242,6 +242,7 @@ return [
     'requested_assets_menu' => 'Requested Assets',
     'request_canceled'      => 'Request Canceled',
     'request_item'          => 'Request this item',
+    'external_link_tooltip' => 'External link to',
     'save'  				=> 'Save',
     'select_var'            => 'Select :thing... ', // this will eventually replace all of our other selects
     'select'				=> 'Select',
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 046c6a2a4b..fc1f0bedcc 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -573,7 +573,7 @@
 
         if (value) {
             if ((value.indexOf("{") === -1) || (value.indexOf("}") ===-1)) {
-                return '<nobr><a href="' + value + '" target="_blank" title="External link to ' + value + '" data-tooltip="true"><i class="fa fa-external-link"></i> ' + value + '</a></nobr>';
+                return '<nobr><a href="' + value + '" target="_blank" title="{{ trans('general.external_link_tooltip') }} ' + value + '" data-tooltip="true"><i class="fa fa-external-link"></i> ' + value + '</a></nobr>';
             }
             return value;
         }