From 9fefdea9de89fa4db7ff21affca5260181519757 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Tue, 15 Nov 2022 12:50:46 -0800
Subject: [PATCH 1/7] fixes checkout to all description

---
 app/Console/Commands/CheckoutLicenseToAllUsers.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Console/Commands/CheckoutLicenseToAllUsers.php b/app/Console/Commands/CheckoutLicenseToAllUsers.php
index fab2b318c..d655b5ace 100644
--- a/app/Console/Commands/CheckoutLicenseToAllUsers.php
+++ b/app/Console/Commands/CheckoutLicenseToAllUsers.php
@@ -22,7 +22,7 @@ class CheckoutLicenseToAllUsers extends Command
      *
      * @var string
      */
-    protected $description = 'Command description';
+    protected $description = 'Checks out licenses to all users';
 
     /**
      * Create a new command instance.

From 9056d48775a0462f76e2f185bf86b97c71f1747d Mon Sep 17 00:00:00 2001
From: "Instead of looking elsewhere, it is better to come here together"
 <npmbot+github@gmail.com>
Date: Wed, 16 Nov 2022 18:16:45 +0800
Subject: [PATCH 2/7] Fixed: 12095

---
 .../views/notifications/markdown/checkin-asset.blade.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/notifications/markdown/checkin-asset.blade.php b/resources/views/notifications/markdown/checkin-asset.blade.php
index 947fed28c..74a438170 100644
--- a/resources/views/notifications/markdown/checkin-asset.blade.php
+++ b/resources/views/notifications/markdown/checkin-asset.blade.php
@@ -3,8 +3,8 @@
 
 {{ trans('mail.the_following_item') }}
 
-@if ($item->getImageUrl())
-<center><img src="{{ app\Models\Setting::getSettings()->show_images_in_email =='1' && $item->getImageUrl() }}" alt="Asset" style="max-width: 570px;"></center>
+@if (($snipeSettings->show_images_in_email =='1') && $item->getImageUrl())
+<center><img src="{{ $item->getImageUrl() }}" alt="Asset" style="max-width: 570px;"></center>
 @endif
 
 @component('mail::table')

From 24841a75d488d6cb13bd30e833a103dac50eb6fc Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 17 Nov 2022 19:41:10 +0000
Subject: [PATCH 3/7] Move common things into the model level validation

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Models/CustomField.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php
index e94b3fcc2..7d5f1320c 100644
--- a/app/Models/CustomField.php
+++ b/app/Models/CustomField.php
@@ -48,7 +48,11 @@ class CustomField extends Model
      *
      * @var array
      */
-    protected $rules = [];
+    protected $rules = [
+        'name' => 'required|unique:custom_fields',
+        'element' => 'required','in:text,listbox,textarea,checkbox,radio',
+        'field_encrypted' => 'nullable|boolean',
+    ];
 
     /**
      * The attributes that are mass assignable.
@@ -357,15 +361,9 @@ class CustomField extends Model
     public function validationRules($regex_format = null)
     {
         return [
-            'name' => 'required|unique:custom_fields',
-            'element' => [
-                'required',
-                Rule::in(['text', 'listbox',  'textarea', 'checkbox', 'radio']),
-            ],
             'format' => [
                 Rule::in(array_merge(array_keys(self::PREDEFINED_FORMATS), self::PREDEFINED_FORMATS, [$regex_format])),
-            ],
-            'field_encrypted' => 'nullable|boolean',
+            ]
         ];
     }
 

From 86bc409d3aba34932178a822bab787b0ee7f8529 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Thu, 17 Nov 2022 12:57:53 -0800
Subject: [PATCH 4/7] adds serial column to the action logs

---
 app/Http/Transformers/ActionlogsTransformer.php | 1 +
 resources/views/users/view.blade.php            | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php
index 602fc6400..c58760d4d 100644
--- a/app/Http/Transformers/ActionlogsTransformer.php
+++ b/app/Http/Transformers/ActionlogsTransformer.php
@@ -85,6 +85,7 @@ class ActionlogsTransformer
                 'id' => (int) $actionlog->item->id,
                 'name' => ($actionlog->itemType()=='user') ? e($actionlog->item->getFullNameAttribute()) : e($actionlog->item->getDisplayNameAttribute()),
                 'type' => e($actionlog->itemType()),
+                'serial' =>e($actionlog->item->serial) ? e($actionlog->item->serial) : null
             ] : null,
             'location' => ($actionlog->location) ? [
                 'id' => (int) $actionlog->location->id,
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index f210bb03e..8974a850f 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -935,7 +935,9 @@
                   @if  ($snipeSettings->require_accept_signature=='1')
                       <th class="col-md-3" data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
                   @endif
-                <th class="col-sm-3" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
+                  <th class="col-sm-3" data-field="item.serial" data-visible="false">{{ trans('admin/hardware/table.serial') }}</th>
+
+                  <th class="col-sm-3" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
                 <th class="col-sm-2" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
               </tr>
               </thead>

From 5c94ca14033b4e6238aff4758e8dda540d44a668 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Thu, 17 Nov 2022 13:06:07 -0800
Subject: [PATCH 5/7] removes dead space

---
 resources/views/users/view.blade.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 8974a850f..445515449 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -936,7 +936,6 @@
                       <th class="col-md-3" data-field="signature_file" data-visible="false"  data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
                   @endif
                   <th class="col-sm-3" data-field="item.serial" data-visible="false">{{ trans('admin/hardware/table.serial') }}</th>
-
                   <th class="col-sm-3" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
                 <th class="col-sm-2" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
               </tr>

From 0a9fd0b867f7d4cf7b1cef4eac804fc83a5e2453 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Thu, 17 Nov 2022 13:09:06 -0800
Subject: [PATCH 6/7] adds serial to activity report page

---
 resources/views/reports/activity.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/views/reports/activity.blade.php b/resources/views/reports/activity.blade.php
index 90a3ded45..0922bf6b0 100644
--- a/resources/views/reports/activity.blade.php
+++ b/resources/views/reports/activity.blade.php
@@ -49,6 +49,7 @@
                             <th class="col-sm-2" data-field="action_type">{{ trans('general.action') }}</th>
                             <th class="col-sm-2" data-field="file" data-visible="false" data-formatter="fileUploadNameFormatter">{{ trans('general.file_name') }}</th>
                             <th class="col-sm-1" data-field="type" data-formatter="itemTypeFormatter">{{ trans('general.type') }}</th>
+                            <th class="col-sm-3" data-field="item.serial" data-visible="false">{{ trans('admin/hardware/table.serial') }}</th>
                             <th class="col-sm-3" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
                             <th class="col-sm-2" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.to') }}</th>
                             <th class="col-sm-1" data-field="note">{{ trans('general.notes') }}</th>

From 774962c1221a08198aab8b6dbb7f880548912744 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 17 Nov 2022 21:14:35 +0000
Subject: [PATCH 7/7] Fixed typo

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Models/CustomField.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php
index 7d5f1320c..e0b06318b 100644
--- a/app/Models/CustomField.php
+++ b/app/Models/CustomField.php
@@ -50,7 +50,7 @@ class CustomField extends Model
      */
     protected $rules = [
         'name' => 'required|unique:custom_fields',
-        'element' => 'required','in:text,listbox,textarea,checkbox,radio',
+        'element' => 'required|in:text,listbox,textarea,checkbox,radio',
         'field_encrypted' => 'nullable|boolean',
     ];