add dedicated fetch method

matthieu-rolland · Oct 5, 2022 · 310da3c · 310da3c
1 parent a976e57
commit 310da3c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/classes/module/Module.php b/classes/module/Module.php
@@ -1691,6 +1691,18 @@ public static function getModulesInstalled($position = 0)
         return Db::getInstance()->executeS($sql);
     }
 
+    /**
+     * Return modules that are installed AND enabled
+     *
+     * @return array Modules
+     */
+    public static function getModulesInstalledAndEnabled()
+    {
+        $sql = 'SELECT m.* FROM `' . _DB_PREFIX_ . 'module` m WHERE `active` = 1';
+
+        return Db::getInstance()->executeS($sql);
+    }
+
     /**
      * Returns the list of the payment module associated to the current customer.
      *

diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php
@@ -471,7 +471,7 @@ protected function formatCategoryDiscountList($id_group)
 
     public function formatModuleListAuth($id_group)
     {
-        $modules = Module::getModulesInstalled();
+        $modules = Module::getModulesInstalledAndEnabled();
         $authorized_modules = '';
 
         $auth_modules = [];

diff --git a/src/Adapter/Module/Module.php b/src/Adapter/Module/Module.php
@@ -512,6 +512,16 @@ public function getModulesInstalled($position = 0)
         return LegacyModule::getModulesInstalled((int) $position);
     }
 
+    /**
+     * Return modules that are installed AND enabled
+     *
+     * @return array Modules
+     */
+    public function getModulesInstalledAndEnabled()
+    {
+        return LegacyModule::getModulesInstalledAndEnabled();
+    }
+
     /**
      * Return an instance of the specified module.
      *

diff --git a/src/PrestaShopBundle/Controller/Admin/Improve/Design/PositionsController.php b/src/PrestaShopBundle/Controller/Admin/Improve/Design/PositionsController.php
@@ -72,7 +72,7 @@ public function indexAction(Request $request)
 
         $moduleAdapter = $this->get('prestashop.adapter.legacy.module');
         $hookProvider = $this->get('prestashop.adapter.legacy.hook');
-        $installedModules = $moduleAdapter->getModulesInstalled();
+        $installedModules = $moduleAdapter->getModulesInstalledAndEnabled();
 
         $selectedModule = $request->get('show_modules');
         if ($selectedModule && (string) $selectedModule != 'all') {
@@ -83,7 +83,7 @@ public function indexAction(Request $request)
 
         $modules = [];
         foreach ($installedModules as $installedModule) {
-            if ($installedModule['active'] && $module = $moduleAdapter->getInstanceById($installedModule['id_module'])) {
+            if ($module = $moduleAdapter->getInstanceById($installedModule['id_module'])) {
                 // We want to be able to sort modules by display name
                 $modules[(int) $module->id] = $module;
             }