Merge branch '10.0/bugfixes'

.devcontainer/devcontainer.json

@@ -12,7 +12,7 @@
             "label": "GLPI"
         },
         "8090": {
-            "label": "Adminer"
+            "label": "DBGate"
         },
         "8025": {
             "label": "Mailpit"

.devcontainer/docker-compose.yaml

@@ -37,15 +37,22 @@ services:
     ports:
       - "8025:8025"
 
-  adminer:
-    container_name: "glpi-adminer"
-    image: "adminer:latest"
+  dbgate:
+    container_name: "glpi-dbgate"
+    image: "dbgate/dbgate:latest"
     restart: "unless-stopped"
     ports:
-      - "8090:8080"
+      - "8090:3000"
     environment:
-      - "ADMINER_DEFAULT_SERVER=db"
-    command: ["php", "-S", "0.0.0.0:8080", "-t", "/var/www/html"]
+      CONNECTIONS: con_glpi
+
+      LABEL_con_glpi: GLPI Mysql Server
+      SERVER_con_glpi: db
+      USER_con_glpi: root
+      PASSWORD_con_glpi: glpi
+      PORT_con_glpi: 3306
+      ENGINE_con_glpi: mysql@dbgate-plugin-mysql
+
 
 volumes:
   db:

.github/workflows/coverage-schedule.yml

@@ -0,0 +1,12 @@
+name: "Code coverage schedule"
+
+on:
+  schedule:
+    - cron:  '0 0 * * *'
+
+jobs:
+  run-coverage-workflow:
+    name: "Run coverage workflow"
+    uses: "glpi-project/glpi/.github/workflows/coverage.yml@main"
+    with:
+      branch: "main"

.github/workflows/coverage.yml

@@ -1,27 +1,29 @@
 name: "GLPI test code coverage"
 
 on:
-  # Runs coverage suite when a pull request updates workflow file
-  pull_request:
-    paths:
-      - ".github/workflows/coverage.yml"
-  # Runs coverage suite every night
-  schedule:
-    - cron:  '0 0 * * *'
+  # Enable execution from the "Code coverage schedule" workflow
+  workflow_call:
+    inputs:
+      branch:
+        required: true
+        type: string
   # Enable manual run
   workflow_dispatch:
+    inputs:
+      branch:
+        description: "Target branch"
+        required: true
+        type: string
 
 jobs:
   coverage:
-    # Do not run scheduled coverage on tier repositories
-    if: github.repository == 'glpi-project/glpi' || github.event_name != 'schedule'
     name: "Code coverage"
     runs-on: "ubuntu-latest"
     strategy:
       fail-fast: false
       matrix:
         include:
-          - {branch: "main", php-version: "8.2", db-image: "mariadb:11.0"}
+          - {php-version: "8.2", db-image: "mariadb:11.0"}
     env:
       COMPOSE_FILE: ".github/actions/docker-compose-app.yml:.github/actions/docker-compose-services.yml"
       APPLICATION_ROOT: "${{ github.workspace }}"
@@ -36,7 +38,7 @@ jobs:
       - name: "Checkout"
         uses: "actions/checkout@v4"
         with:
-          ref: ${{ matrix.branch }}
+          ref: ${{ inputs.branch }}
       - name: "Restore dependencies cache"
         uses: actions/cache@v4
         with:
@@ -76,4 +78,4 @@ jobs:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
           files: ./tests/coverage-functional/clover.xml,./tests/coverage-ldap/clover.xml,./tests/coverage-imap/clover.xml
-          override_branch: ${{ matrix.branch }}
+          override_branch: ${{ inputs.branch }}

js/impact.js

@@ -2593,8 +2593,8 @@ var GLPIImpact = {
     */
     addCompoundFromSelection: _.debounce(function(){
         // Check that there is enough selected nodes
-        if (GLPIImpact.eventData.boxSelected.length < 2) {
-            alert(__("You need to select at least 2 assets to make a group"));
+        if (GLPIImpact.eventData.boxSelected.length < 1) {
+            alert(__("You need to select at least 1 asset to make a group"));
         } else {
             // Create the compound
             var newCompound = GLPIImpact.cy.add({

src/AllAssets.php

@@ -44,4 +44,9 @@ public static function getTypeName($nb = 0)
     {
         return _n('Asset', 'Assets', $nb);
     }
+
+    public static function getIcon()
+    {
+        return 'ti ti-packages';
+    }
 }

src/Html.php

@@ -1446,7 +1446,7 @@ public static function generateMenuSession($force = false)
                     $menu['assets']['content']['allassets']['title']            = __('Global');
                     $menu['assets']['content']['allassets']['shortcut']         = '';
                     $menu['assets']['content']['allassets']['page']             = '/front/allassets.php';
-                    $menu['assets']['content']['allassets']['icon']             = 'fas fa-list';
+                    $menu['assets']['content']['allassets']['icon']             = AllAssets::getIcon();
                     $menu['assets']['content']['allassets']['links']['search']  = '/front/allassets.php';
                     break;
                 }