Merge remote-tracking branch 'origin/develop'

.github/workflows/SA-codeql.yml

@@ -26,7 +26,7 @@ jobs:
         language: [ 'javascript' ]
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/codacy-analysis.yml

@@ -32,7 +32,7 @@ jobs:
     steps:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI

.github/workflows/crowdin-upload.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Crowdin push
         uses: crowdin/github-action@v2

.github/workflows/docker-alpine.yml

@@ -42,7 +42,7 @@ jobs:
     steps:
       # https://github.com/actions/checkout
       - name: Checkout codebase
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       # https://github.com/docker/setup-buildx-action
       - name: Setup Docker Buildx

.github/workflows/docker-ubuntu.yml

@@ -42,7 +42,7 @@ jobs:
     steps:
       # https://github.com/actions/checkout
       - name: Checkout codebase
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       # https://github.com/docker/setup-buildx-action
       - name: Setup Docker Buildx

.github/workflows/dockerhub-description.yml

@@ -11,7 +11,7 @@ jobs:
   dockerHubDescription:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Docker Hub Description
         uses: grokability/dockerhub-description@7ea9d275c7cdbe2b676a093a0308c50665e3b8b4

.github/workflows/tests-mysql.yml

@@ -37,7 +37,7 @@ jobs:
           php-version: "${{ matrix.php-version }}"
           coverage: none
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Get Composer Cache Directory
         id: composer-cache

.github/workflows/tests-postgres.yml

@@ -34,7 +34,7 @@ jobs:
           php-version: "${{ matrix.php-version }}"
           coverage: none
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Get Composer Cache Directory
         id: composer-cache

.github/workflows/tests-sqlite.yml

@@ -25,7 +25,7 @@ jobs:
           php-version: "${{ matrix.php-version }}"
           coverage: none
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Get Composer Cache Directory
         id: composer-cache

app/Http/Controllers/Api/LicenseSeatsController.php

@@ -80,7 +80,7 @@ class LicenseSeatsController extends Controller
 
         $this->authorize('view', License::class);
 
-        if ($licenseSeat = LicenseSeat::where('id',$seatId)->where('license_id', $licenseId)->first()) {
+        if ($licenseSeat = LicenseSeat::where('license_id', $licenseId)->find($seatId)) {
             return (new LicenseSeatsTransformer)->transformLicenseSeat($licenseSeat);
         }
 

resources/views/users/edit.blade.php

@@ -291,16 +291,16 @@
 
                       <div class="col-md-12">
 
-                      <fieldset name="optional_details">
+                      <fieldset>
 
                           <x-form-legend>
-                              <h4 id="optional_details" class="remember-toggle optional_details">
-                                  <x-icon type="caret-right" class="fa-fw" id="toggle-arrow-optional_details" />
+                              <h4 id="optional_user_details" class="remember-toggle">
+                                  <x-icon type="caret-down" class="fa-fw" id="toggle-arrow-optional_user_details" />
                                   {{ trans('admin/hardware/form.optional_infos') }}
                               </h4>
                           </x-form-legend>
 
-                          <div class="col-md-12 toggle-content-optional_details" style="display:none">
+                          <div class="col-md-12 toggle-content-optional_user_details">
 
                               <!-- everything here should be what is considered optional -->
                               <br>