fix(Impact): use genericobject/front/getimpacticon.php to serve icon

pluginsGLPI · Jan 8, 2024 · b7f05dd · b7f05dd
1 parent 872182a
commit b7f05dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/inc/type.class.php b/inc/type.class.php
@@ -2829,13 +2829,13 @@ public function getImpactIconFilePath(): ?string
     *
     * @return null|string
     */
-    public function getImpactIconUrl(): ?string
+    public function getImpactIconUrl($full = true): ?string
     {
        // Check that the file exist
         if (!$this->getImpactIconFilePath()) {
             return null;
         }
 
-        return Plugin::getWebDir('genericobject') . "/front/getimpacticon.php?itemtype=" . $this->fields['itemtype'];
+        return Plugin::getWebDir('genericobject', $full) . "/front/getimpacticon.php?itemtype=" . $this->fields['itemtype'];
     }
 }
diff --git a/setup.php b/setup.php
@@ -201,11 +201,9 @@ function plugin_init_genericobject()
             if (empty($row['impact_icon'])) {
                 $icon = ""; // Will fallback to default impact icon
             } else {
-                $icon = PluginGenericobjectType::getImpactIconFileStoragePath(
-                    $row['impact_icon'],
-                    $row['itemtype'],
-                    true
-                ) ?? "";
+                $obj = new PluginGenericobjectType();
+                $obj->getFromDB($row['id']);
+                $icon = $obj->getImpactIconUrl(false) ?? "";
             }
 
             $CFG_GLPI['impact_asset_types'][$row['itemtype']] = $icon;