Merge branch 'develop'

2026-01-10 18:28:40 +00:00 · 2024-04-24 23:44:27 +00:00 · 2024-04-24 23:44:27 +00:00 · ddd23c08de
commit ddd23c08de
parent a66f94473b 44d3f38943
21 changed files with 36 additions and 22 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -13,10 +13,15 @@ on:
    - cron: '0 0 1,15 * *'

 jobs:
-  general_module_workflow:
+  general_module_workflow_php:
    uses: Karaka-Management/Karaka/.github/workflows/php_template.yml@develop
    secrets:
      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      GH_PAT: ${{ secrets.GH_PAT }}
      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-
+  general_module_workflow_js:
+    uses: Karaka-Management/Karaka/.github/workflows/js_template.yml@develop
+    secrets:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GH_PAT: ${{ secrets.GH_PAT }}
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@ -2,7 +2,7 @@
 /**
 * Jingga
 *
- * PHP Version 8.1
+ * PHP Version 8.2
 *
 * @package   Modules\Search\Admin
 * @copyright Dennis Eichhorn
--- a/Admin/Routes/Web/Api.php
+++ b/Admin/Routes/Web/Api.php
@ -2,7 +2,7 @@
 /**
 * Jingga
 *
- * PHP Version 8.1
+ * PHP Version 8.2
 *
 * @package   Modules
 * @copyright Dennis Eichhorn
@ -22,6 +22,8 @@ return [
        [
            'dest'       => '\Modules\Search\Controller\ApiController:search',
            'verb'       => RouteVerb::ANY,
+            'csrf'       => true,
+            'active'     => true,
            'permission' => [
                'module' => ApiController::NAME,
                'type'   => PermissionType::READ,
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@ -2,7 +2,7 @@
 /**
 * Jingga
 *
- * PHP Version 8.1
+ * PHP Version 8.2
 *
 * @package   Modules
 * @copyright Dennis Eichhorn
@ -18,10 +18,11 @@ use phpOMS\Account\PermissionType;
 use phpOMS\Router\RouteVerb;

 return [
-    '^.*/search(\?.*|$)' => [
+    '^/search(\?.*|$)' => [
        [
            'dest'       => '\Modules\Search\Controller\BackendController:search',
            'verb'       => RouteVerb::ANY,
+            'active'     => true,
            'permission' => [
                'module' => BackendController::NAME,
                'type'   => PermissionType::READ,
--- a/Admin/Status.php
+++ b/Admin/Status.php
@ -2,7 +2,7 @@
 /**
 * Jingga
 *
- * PHP Version 8.1
+ * PHP Version 8.2
 *
 * @package   Modules\Search\Admin
 * @copyright Dennis Eichhorn
--- a/Admin/Uninstaller.php
+++ b/Admin/Uninstaller.php
@ -2,7 +2,7 @@
 /**
 * Jingga
 *
- * PHP Version 8.1
+ * PHP Version 8.2
 *
 * @package   Modules\Search\Admin
 * @copyright Dennis Eichhorn
--- a/Admin/Updater.php
+++ b/Admin/Updater.php
@ -2,7 +2,7 @@
 /**
 * Jingga
 *
- * PHP Version 8.1
+ * PHP Version 8.2
 *
 * @package   Modules\Search\Admin
 * @copyright Dennis Eichhorn
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@ -2,7 +2,7 @@
 /**
 * Jingga
 *
- * PHP Version 8.1
+ * PHP Version 8.2
 *
 * @package   Modules\Search
 * @copyright Dennis Eichhorn
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@ -2,7 +2,7 @@
 /**
 * Jingga
 *
- * PHP Version 8.1
+ * PHP Version 8.2
 *
 * @package   Modules\Search
 * @copyright Dennis Eichhorn
--- a/Controller/Controller.php
+++ b/Controller/Controller.php
@ -2,7 +2,7 @@
 /**
 * Jingga
 *
- * PHP Version 8.1
+ * PHP Version 8.2
 *
 * @package   Modules\Search
 * @copyright Dennis Eichhorn
--- a/ICLA.txt
+++ b/ICLA.txt
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -46,3 +46,7 @@ Unless required by applicable law or agreed to in writing, Licensor provides the
 7. Limitation of Liability

 In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+8. Future Changes
+
+The Licensor may change the License for future versions as he sees fit.
--- a/Models/Navigation.js
+++ b/Models/Navigation.js
@ -9,12 +9,12 @@ export class Navigation {
    constructor (data)
    {
        if (typeof data === 'undefined') {
-            this.scrollPosition = {x: 0, y: 0};
+            this.scrollPosition = { x: 0, y: 0 };
            this.activeLinks    = {};
            this.visible        = true;
            this.openCategories = {};
        } else {
-            this.scrollPosition = typeof data.scrollPosition === 'undefined' ? {x : 0, y : 0} : data.scrollPosition;
+            this.scrollPosition = typeof data.scrollPosition === 'undefined' ? { x: 0, y: 0 } : data.scrollPosition;
            this.activeLinks    = typeof data.activeLinks === 'undefined' ? {} : data.activeLinks;
            this.visible        = typeof data.visible === 'undefined' ? true : data.visible;
            this.openCategories = typeof data.openCategories === 'undefined' ? {} : data.openCategories;
--- a/Models/PermissionCategory.php
+++ b/Models/PermissionCategory.php
@ -2,7 +2,7 @@
 /**
 * Jingga
 *
- * PHP Version 8.1
+ * PHP Version 8.2
 *
 * @package   Modules\Search\Models
 * @copyright Dennis Eichhorn
--- a/Theme/Backend/Lang/de.lang.php
+++ b/Theme/Backend/Lang/de.lang.php
@ -2,7 +2,7 @@
 /**
 * Jingga
 *
- * PHP Version 8.1
+ * PHP Version 8.2
 *
 * @package   Modules\Localization
 * @copyright Dennis Eichhorn
--- a/Theme/Backend/Lang/en.lang.php
+++ b/Theme/Backend/Lang/en.lang.php
@ -2,7 +2,7 @@
 /**
 * Jingga
 *
- * PHP Version 8.1
+ * PHP Version 8.2
 *
 * @package   Modules\Localization
 * @copyright Dennis Eichhorn
--- a/Theme/Backend/search-result.tpl.php
+++ b/Theme/Backend/search-result.tpl.php
@ -2,7 +2,7 @@
 /**
 * Jingga
 *
- * PHP Version 8.1
+ * PHP Version 8.2
 *
 * @package   Modules\QA
 * @copyright Dennis Eichhorn
@ -51,12 +51,14 @@ foreach ($this->data as $controller) :
            </a>
        <td class="sm-hidden">
            <?php if (!empty($data['tags'])) : ?>
+                <div class="tag-list">
                <?php foreach ($data['tags'] as $tag) : ?>
                    <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>">
                        <?= empty($tag->icon) ? '' : '<i class="g-icon">' . $this->printHtml($tag->icon) . '</i>'; ?>
                        <?= $this->printHtml($tag->getL11n()); ?>
                    </span>
                <?php endforeach; ?>
+                </div>
            <?php endif; ?>
    <?php endforeach; ?>
                </table>
--- a/tests/Admin/AdminTest.php
+++ b/tests/Admin/AdminTest.php
@ -2,7 +2,7 @@
 /**
 * Jingga
 *
- * PHP Version 8.1
+ * PHP Version 8.2
 *
 * @package   tests
 * @copyright Dennis Eichhorn
--- a/tests/Autoloader.php
+++ b/tests/Autoloader.php
@ -2,7 +2,7 @@
 /**
 * Jingga
 *
- * PHP Version 8.1
+ * PHP Version 8.2
 *
 * @package   Modules/tests
 * @copyright Dennis Eichhorn
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@ -2,7 +2,7 @@
 /**
 * Jingga
 *
- * PHP Version 8.1
+ * PHP Version 8.2
 *
 * @package   Modules\Search\tests
 * @copyright Dennis Eichhorn
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@ -2,7 +2,7 @@
 /**
 * Jingga
 *
- * PHP Version 8.1
+ * PHP Version 8.2
 *
 * @package   tests
 * @copyright Dennis Eichhorn