Added recursivity for configuring moreoption by entity

src/Config.php

@@ -121,6 +121,7 @@ public static function preItemUpdate(CommonDBTM $item): CommonDBTM
     public static function getItilConfigFields(): array
     {
         return [
+            'use_parent_entity',
             'take_item_group_ticket',
             'take_item_group_change',
             'take_item_group_problem',
@@ -169,31 +170,28 @@ public static function getSelectableActorGroup(): array
 
     public static function showForEntity(Entity $item): void
     {
-        // $parents = getAncestorsOf(Entity::getTable(), $item->getID());
-        // if (!empty($parents)) {
-        //     foreach ($parents as $parent) {
-        //         $pconfig = new Config();
-        //         $pconfig->getFromDBByCrit([
-        //             'entities_id' => $parent,
-        //         ]);
-        //         if ($pconfig->getField('is_active') == 1) {
-        //             $pentity = $parent;
-        //         }
-        //     }
-        //     $csconfig = new self();
-        //     $csconfig->getFromDBByCrit([
-        //         'entities_id' => $pentity ?? 0,
-        //     ]);
-        // }
         $moconfig = new self();
         $moconfig->getFromDBByCrit([
             'entities_id' => $item->getID(),
         ]);
+
+        // Get effective configuration to show which entity's config is actually used
+        $effectiveConfig = self::getConfig($item->getID(), true);
+        $parentEntityInfo = null;
+
+        if (($moconfig->fields['use_parent_entity'] ?? false) && ($effectiveConfig->fields['entities_id'] != $item->getID())) {
+            $parentEntity = new Entity();
+            if ($parentEntity->getFromDB($effectiveConfig->fields['entities_id'])) {
+                $parentEntityInfo = $parentEntity->getName();
+            }
+        }
+
         TemplateRenderer::getInstance()->display(
             '@moreoptions/config.html.twig',
             [
                 'item' => $moconfig,
                 'dropdown_options' => self::getSelectableActorGroup(),
+                'parent_entity_info' => $parentEntityInfo,
                 'params' => [
                     'canedit' => true,
                 ],
@@ -215,12 +213,34 @@ public static function addConfig(CommonDBTM $item): void
         ]);
     }
 
-    public static function getCurrentConfig(): self
+    /**
+     * Get configuration for an entity
+     *
+     * @param int|null $entityId Entity ID (null = current active entity)
+     * @param bool $useInheritance Whether to follow parent entity inheritance (default: true)
+     * @return self
+     */
+    public static function getConfig(?int $entityId = null, bool $useInheritance = true): self
     {
+        // Use current entity if not specified
+        if ($entityId === null) {
+            $entityId = Session::getActiveEntity();
+        }
+
         $moconfig = new self();
         $moconfig->getFromDBByCrit([
-            'entities_id' => Session::getActiveEntity(),
+            'entities_id' => $entityId,
         ]);
+
+        // If inheritance is enabled, use_parent_entity is set, and we're not at root entity
+        if ($useInheritance && ($moconfig->fields['use_parent_entity'] ?? false) && $entityId > 0) {
+            $entity = new Entity();
+            if ($entity->getFromDB($entityId)) {
+                $parentId = $entity->fields['entities_id'];
+                return self::getConfig($parentId, true);
+            }
+        }
+
         return $moconfig;
     }
 
@@ -235,7 +255,8 @@ public static function install(Migration $migration): void
                 `id` int unsigned NOT NULL AUTO_INCREMENT,
                 `is_active`  tinyint NOT NULL DEFAULT '1',
                 `entities_id` int unsigned NOT NULL DEFAULT '0',
-                `take_item_group_ticket` tinyint NOT NULL DEFAULT '0',
+                `use_parent_entity` tinyint NOT NULL DEFAULT '0',
+                `take_item_group_ticket` tinyint NOT NULL DEFAULT '-2',
                 `take_item_group_change` tinyint NOT NULL DEFAULT '0',
                 `take_item_group_problem` tinyint NOT NULL DEFAULT '0',
                 `take_requester_group_ticket` int unsigned NOT NULL DEFAULT '0',
@@ -280,6 +301,16 @@ public static function install(Migration $migration): void
             $DB->doQuery($query);
         }
 
+        // Migration: Add use_parent_entity column if it doesn't exist
+        if (!$DB->fieldExists($table, 'use_parent_entity')) {
+            $migration->displayMessage("Adding use_parent_entity field to $table");
+            $migration->addField($table, 'use_parent_entity', 'tinyint', [
+                'after' => 'entities_id',
+                'value' => 0,
+                'nodefault' => false,
+            ]);
+        }
+
         $entities = new Entity();
         foreach ($entities->find() as $entity) {
             if (is_array($entity) && isset($entity['id'])) {

src/Controller.php

@@ -84,10 +84,7 @@ public static function useConfig(CommonDBTM $item): void
         if ($item->fields['type'] == \CommonITILActor::OBSERVER) {
             return;
         }
-        $moconfig = new Config();
-        $moconfig->getFromDBByCrit([
-            'entities_id' => Session::getActiveEntity(),
-        ]);
+        $moconfig = Config::getConfig();
 
         if ($moconfig->fields['is_active'] != 1) {
             return;
@@ -134,7 +131,7 @@ public static function useConfig(CommonDBTM $item): void
 
     public static function addItemGroups(CommonDBTM $item): void
     {
-        $conf = Config::getCurrentConfig();
+        $conf = Config::getConfig();
         if ($conf->fields['is_active'] != 1) {
             return;
         }
@@ -307,7 +304,7 @@ public static function beforeCloseITILObject(CommonITILObject $item): void
 
     public static function preventClosure(CommonDBTM $item): void
     {
-        $conf = Config::getCurrentConfig();
+        $conf = Config::getConfig();
         if ($conf->fields['is_active'] != 1) {
             return;
         }
@@ -344,7 +341,7 @@ public static function preventClosure(CommonDBTM $item): void
 
     public static function requireFieldsToClose(CommonITILObject $item): void
     {
-        $conf = Config::getCurrentConfig();
+        $conf = Config::getConfig();
         if ($conf->fields['is_active'] != 1) {
             return;
         }
@@ -436,7 +433,7 @@ public static function requireFieldsToClose(CommonITILObject $item): void
 
     public static function checkTaskRequirements(CommonDBTM $item): CommonDBTM
     {
-        $conf = Config::getCurrentConfig();
+        $conf = Config::getConfig();
         if ($conf->fields['is_active'] != 1) {
             return $item;
         }
@@ -477,7 +474,7 @@ public static function checkTaskRequirements(CommonDBTM $item): CommonDBTM
 
     public static function updateItemActors(CommonITILObject $item): CommonITILObject
     {
-        $conf = Config::getCurrentConfig();
+        $conf = Config::getConfig();
         if ($conf->fields['is_active'] != 1) {
             return $item;
         }

templates/config.html.twig

@@ -59,6 +59,19 @@
                             __('Active on this entity', 'moreoptions')
                         ) }}
 
+                        {% if item.fields['entities_id'] != 0 %}
+                            {{ fields.checkboxField(
+                                'use_parent_entity',
+                                item.fields['use_parent_entity'],
+                                __('Use parent entity configuration', 'moreoptions'),
+                                {'helper': __('When enabled, this entity will inherit configuration from its parent entity', 'moreoptions')}
+                            ) }}
+
+                            {% if parent_entity_info %}
+                                {{ alerts.alert_info(__('Configuration is inherited from parent entity: %s', 'moreoptions')|format(parent_entity_info)) }}
+                            {% endif %}
+                        {% endif %}
+
                         <div class="moreoptions-config">
                             <table class="table table-hover border card-table" id="config_table">
                                 <thead>
@@ -257,6 +270,29 @@
 
 <script>
     $(document).ready(function() {
+        // Handle use parent entity option
+        function toggleConfigOptions() {
+            const useParentEntity = document.querySelector('input[name="use_parent_entity"]');
+            const configDiv = document.querySelector('.moreoptions-config');
+
+            if (useParentEntity && configDiv) {
+                if (useParentEntity.checked) {
+                    configDiv.style.display = 'none';
+                } else {
+                    configDiv.style.display = 'block';
+                }
+            }
+        }
+
+        // Initialize on load
+        toggleConfigOptions();
+
+        // Listen for changes
+        const useParentEntityCheckbox = document.querySelector('input[name="use_parent_entity"]');
+        if (useParentEntityCheckbox) {
+            useParentEntityCheckbox.addEventListener('change', toggleConfigOptions);
+        }
+
         // Take item group all functionality
         const takeItemGroupAll = document.querySelector('input[id="take_item_group_all"]');
         const takeItemGroupCheckboxes = document.querySelectorAll('input[type="checkbox"][id*="take_item_group"]');

tests/MoreOptionsTestCase.php

@@ -34,38 +34,15 @@
 namespace GlpiPlugin\Moreoptions\Tests;
 
 use Auth;
+use DbTestCase;
 use GlpiPlugin\Moreoptions\Config;
-use PHPUnit\Framework\TestCase;
 use Session;
 
-abstract class MoreOptionsTestCase extends TestCase
+abstract class MoreOptionsTestCase extends DbTestCase
 {
     public const TU_USER = 'glpi';
     public const TU_PASS = 'glpi';
 
-    protected function setUp(): void
-    {
-        global $DB;
-
-        // Start a transaction for each test
-        $DB->beginTransaction();
-
-        // Connect the test user
-        $this->login();
-
-        parent::setUp();
-    }
-
-    protected function tearDown(): void
-    {
-        global $DB;
-
-        // Rollback the transaction to clean up the database
-        $DB->rollback();
-
-        parent::tearDown();
-    }
-
     /**
      * Login with the test user
      */
@@ -79,7 +56,7 @@
         Session::start();
 
         $auth = new Auth();
         $this->assertEquals($expected, $auth->login($user_name, $user_pass, $noauto));
 
         return $auth;
     }
@@ -102,8 +79,6 @@
      */
     protected function createTestConfig(array $options = []): Config
     {
-        $config = new Config();
-
         $default_config = [
             'is_active' => 1,
             'entities_id' => 0,
@@ -132,28 +107,24 @@
 
         $input = array_merge($default_config, $options);
 
-        $result = $config->add($input);
-        $this->assertGreaterThan(0, $result, 'Failed to create test config');
-
-        return $config;
+        return $this->createItem(Config::class, $input);
     }
 
     /**
      * Update the test configuration
      * @param array<string, mixed> $updates
      */
-    protected function updateTestConfig(Config $config, array $updates): bool
+    protected function updateTestConfig(Config $config, array $updates): Config
     {
-        $input = array_merge(['id' => $config->getID()], $updates);
-        return $config->update($input);
+        return $this->updateItem(Config::class, $config->getID(), $updates);
     }
 
     /**
      * Get the current configuration or create one
      */
     protected function getCurrentConfig(): Config
     {
-        $config = Config::getCurrentConfig();
+        $config = Config::getConfig();
         if (empty($config->fields) || $config->isNewItem()) {
             $config = $this->createTestConfig();
         }