Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	public/css/build/app.css
#	public/css/build/app.css.map
#	public/css/build/overrides.css
#	public/css/build/overrides.css.map
#	public/css/dist/all.css
#	public/mix-manifest.json

Author: snipe

app/Helpers/Helper.php

@@ -1856,4 +1856,42 @@ public static function normalizeFullModelName($model): string
         return 'App\\Models\\'.ucwords($model);
 
     }
+
+    /**
+     * Render a markdown-textarea value as HTML.
+     *
+     * Soft line breaks (single newlines) are rendered as <br> so that line
+     * breaks typed in the textarea are preserved in the output.
+     *
+     * When $inline is true, block-level elements are suppressed and hard
+     * breaks are pre-processed manually — used for the encrypted reveal span
+     * where block HTML cannot be placed inside a font-size-toggled <span>.
+     */
+    public static function renderMarkdown(?string $text, bool $inline = false): string
+    {
+        if (empty($text)) {
+            return '';
+        }
+
+        if ($inline) {
+            // Convert newlines to CommonMark hard breaks for inline rendering
+            $text = preg_replace('/(?<! {2})\n/', "  \n", $text);
+
+            return Str::inlineMarkdown($text, ['html_input' => 'escape']);
+        }
+
+        $html = trim(Str::markdown($text, [
+            'html_input' => 'escape',
+            'renderer' => ['soft_break' => "<br>\n"],
+        ]));
+
+        // If the entire output is a single <p> block, unwrap it so the content
+        // renders inline-ish without the <p> adding unwanted top spacing in the
+        // compact detail-view layout.
+        if (str_starts_with($html, '<p>') && str_ends_with($html, '</p>') && substr_count($html, '<p>') === 1) {
+            return substr($html, 3, -4);
+        }
+
+        return $html;
+    }
 }

app/Http/Controllers/Kits/CheckoutKitController.php

@@ -53,6 +53,8 @@ public function showCheckout(PredefinedKit $kit)
      */
     public function store(Request $request, $kit_id)
     {
+        $this->authorize('checkout', Asset::class);
+
         $user_id = e($request->input('user_id'));
         if (is_null($user = User::find($user_id))) {
             return redirect()->back()->with('error', trans('admin/users/message.user_not_found'));

app/Http/Controllers/ViewAssetsController.php

@@ -222,6 +222,10 @@ public function getRequestItem(Request $request, $itemType, $itemId = null, $can
 
             return redirect()->back()->with('success')->with('success', trans('admin/hardware/message.requests.canceled'));
         } else {
+            if ($fullItemType === Asset::class && is_null(Asset::RequestableAssets()->find($item->id))) {
+                return redirect()->back()->with('error', trans('admin/hardware/message.requests.error'));
+            }
+
             $item->request();
             if (($settings->alert_email != '') && ($settings->alerts_enabled == '1') && (! config('app.lock_passwords'))) {
                 $logaction->logaction('requested');

app/Http/Transformers/AssetsTransformer.php

@@ -144,7 +144,7 @@ public function transformAsset(Asset $asset)
 
                     $fields_array[$field->name] = [
                         'field' => e($field->db_column),
-                        'value' => e($value),
+                        'value' => ($field->element == 'markdown-textarea' && Gate::allows('assets.view.encrypted_custom_fields')) ? Helper::renderMarkdown($value) : e($value),
                         'field_format' => $field->format,
                         'element' => $field->element,
                     ];
@@ -158,7 +158,7 @@ public function transformAsset(Asset $asset)
 
                     $fields_array[$field->name] = [
                         'field' => e($field->db_column),
-                        'value' => e($value),
+                        'value' => ($field->element == 'markdown-textarea') ? Helper::renderMarkdown($value) : e($value),
                         'field_format' => $field->format,
                         'element' => $field->element,
                     ];
@@ -274,7 +274,7 @@ public function transformRequestedAsset(Asset $asset)
                         $value = Helper::getFormattedDateObject($value, 'date', false);
                     }
 
-                    $fields_array[$field->db_column] = e($value);
+                    $fields_array[$field->db_column] = ($field->element == 'markdown-textarea') ? Helper::renderMarkdown($value) : e($value);
                 }
 
                 $array['custom_fields'] = $fields_array;

app/Models/CustomField.php

@@ -51,7 +51,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,markdown-textarea,checkbox,radio',
         'field_encrypted' => 'nullable|boolean',
         'auto_add_to_fieldsets' => 'boolean',
         'show_in_listview' => 'boolean',

app/Services/PredefinedKitCheckoutService.php

@@ -7,21 +7,21 @@
 use App\Models\User;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 
 /**
  * Class incapsulates checkout logic for reuse in different controllers
+ *
  * @author [D. Minaev.] [<dmitriy.minaev.v@gmail.com>]
  */
 class PredefinedKitCheckoutService
 {
     use AuthorizesRequests;
 
     /**
-     * @param Request $request, this function works with fields: checkout_at, expected_checkin, note
-     * @param PredefinedKit $kit kit for checkout
-     * @param User $user checkout target
+     * @param  Request  $request,  this function works with fields: checkout_at, expected_checkin, note
+     * @param  PredefinedKit  $kit  kit for checkout
+     * @param  User  $user  checkout target
      * @return array Empty array if all ok, else [string_error1, string_error2...]
      */
     public function checkout(Request $request, PredefinedKit $kit, User $user)
@@ -93,7 +93,7 @@ protected function getAssetsToAdd($kit, $user, &$errors)
                 }
             }
             if ($quantity > 0) {
-                $errors[] = trans('admin/kits/general.none_models', ['model'=> $model->name, 'qty' => $model->pivot->quantity]);
+                $errors[] = trans('admin/kits/general.none_models', ['model' => $model->name, 'qty' => $model->pivot->quantity]);
             }
         }
 
@@ -107,9 +107,10 @@ protected function getLicenseSeatsToAdd($kit, &$errors)
             ->with('freeSeats')
             ->get();
         foreach ($licenses as $license) {
+            $this->authorize('checkout', $license);
             $quantity = $license->pivot->quantity;
             if ($quantity > count($license->freeSeats)) {
-                $errors[] = trans('admin/kits/general.none_licenses', ['license'=> $license->name, 'qty' => $license->pivot->quantity]);
+                $errors[] = trans('admin/kits/general.none_licenses', ['license' => $license->name, 'qty' => $license->pivot->quantity]);
             }
             for ($i = 0; $i < $quantity; $i++) {
                 $seats_to_add[] = $license->freeSeats[$i];
@@ -123,8 +124,9 @@ protected function getConsumablesToAdd($kit, &$errors)
     {
         $consumables = $kit->consumables()->with('users')->get();
         foreach ($consumables as $consumable) {
+            $this->authorize('checkout', $consumable);
             if ($consumable->numRemaining() < $consumable->pivot->quantity) {
-                $errors[] = trans('admin/kits/general.none_consumables', ['consumable'=> $consumable->name, 'qty' => $consumable->pivot->quantity]);
+                $errors[] = trans('admin/kits/general.none_consumables', ['consumable' => $consumable->name, 'qty' => $consumable->pivot->quantity]);
             }
         }
 
@@ -135,8 +137,9 @@ protected function getAccessoriesToAdd($kit, &$errors)
     {
         $accessories = $kit->accessories()->with('users')->get();
         foreach ($accessories as $accessory) {
+            $this->authorize('checkout', $accessory);
             if ($accessory->numRemaining() < $accessory->pivot->quantity) {
-                $errors[] = trans('admin/kits/general.none_accessory', ['accessory'=> $accessory->name, 'qty' => $accessory->pivot->quantity]);
+                $errors[] = trans('admin/kits/general.none_accessory', ['accessory' => $accessory->name, 'qty' => $accessory->pivot->quantity]);
             }
         }
 
@@ -175,7 +178,7 @@ function () use ($user, $admin, $checkout_at, $expected_checkin, $errors, $asset
                     ]);
                     event(new CheckoutableCheckedOut($consumable, $user, $admin, $note));
                 }
-                //accessories
+                // accessories
                 foreach ($accessories_to_add as $accessory) {
                     $accessory->assigned_to = $user->id;
                     $accessory->users()->attach($accessory->id, [

database/factories/CustomFieldFactory.php

@@ -154,4 +154,15 @@ public function testRadio()
             ];
         });
     }
+
+    public function testMarkdownTextarea()
+    {
+        return $this->state(function () {
+            return [
+                'name' => 'Notes',
+                'help_text' => 'Additional notes about this asset. Markdown is supported.',
+                'element' => 'markdown-textarea',
+            ];
+        });
+    }
 }

database/seeders/CustomFieldSeeder.php

@@ -36,6 +36,7 @@ public function run()
         CustomField::factory()->count(1)->testEncrypted()->create();
         CustomField::factory()->count(1)->testCheckbox()->create();
         CustomField::factory()->count(1)->testRadio()->create();
+        CustomField::factory()->count(1)->testMarkdownTextarea()->create();
 
         DB::table('custom_field_custom_fieldset')->insert([
             [
@@ -109,6 +110,20 @@ public function run()
                 'required' => 0,
             ],
 
+            [
+                'custom_field_id' => '9',
+                'custom_fieldset_id' => '1',
+                'order' => 0,
+                'required' => 0,
+            ],
+
+            [
+                'custom_field_id' => '9',
+                'custom_fieldset_id' => '2',
+                'order' => 0,
+                'required' => 0,
+            ],
+
         ]);
     }
 }