bump

Karaka-Management · Feb 28, 2024 · 421f074 · 421f074
1 parent f524e49
commit 421f074
Show file tree

Hide file tree

Showing 18 changed files with 404 additions and 556 deletions.
diff --git a/.github/dev_bug_report.md b/.github/dev_bug_report.md
diff --git a/.github/dev_feature_request.md b/.github/dev_feature_request.md
diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
@@ -18,37 +18,36 @@
                 "pid": "/task",
                 "type": 3,
                 "subtype": 1,
-                "name": "List",
+                "name": "Dashboard",
                 "uri": "{/base}/task/dashboard?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
                 "from": "Tasks",
                 "permission": { "permission": 2, "category": null, "element": null },
                 "parent": 1001101001,
-                "children": [
-                    {
-                        "id": 1001102101,
-                        "pid": "/task",
-                        "type": 0,
-                        "subtype": 1,
-                        "name": "Tasks",
-                        "uri": "{/base}/task/view?{?}",
-                        "target": "self",
-                        "icon": null,
-                        "order": 1,
-                        "from": "Tasks",
-                        "permission": { "permission": 2, "category": null, "element": null },
-                        "parent": 1001102001,
-                        "children": []
-                    }
-                ]
+                "children": []
             },
             {
                 "id": 1001103001,
                 "pid": "/task",
                 "type": 3,
                 "subtype": 1,
+                "name": "List",
+                "uri": "{/base}/task/list?{?}",
+                "target": "self",
+                "icon": null,
+                "order": 5,
+                "from": "Tasks",
+                "permission": { "permission": 2, "category": null, "element": null },
+                "parent": 1001101001,
+                "children": []
+            },
+            {
+                "id": 1001104001,
+                "pid": "/task",
+                "type": 3,
+                "subtype": 1,
                 "name": "Create",
                 "uri": "{/base}/task/create?{?}",
                 "target": "self",
@@ -60,7 +59,7 @@
                 "children": []
             },
             {
-                "id": 1001104001,
+                "id": 1001105001,
                 "pid": "/task",
                 "type": 3,
                 "subtype": 1,

diff --git a/Admin/Install/SearchCommands.php b/Admin/Install/SearchCommands.php
@@ -13,6 +13,7 @@
 declare(strict_types=1);
 
 use Modules\Tasks\Controller\SearchController;
+use Modules\Tasks\Models\PermissionCategory;
 use phpOMS\Account\PermissionType;
 use phpOMS\Router\RouteVerb;
 
@@ -27,4 +28,15 @@
             ],
         ],
     ],
+    '^(?!:).+.*?' => [
+        [
+            'dest'       => '\Modules\Tasks\Controller\SearchController:searchGeneral',
+            'verb'       => RouteVerb::ANY,
+            'permission' => [
+                'module' => SearchController::NAME,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionCategory::TASK,
+            ],
+        ],
+    ],
 ];
diff --git a/Admin/Installer.php b/Admin/Installer.php
@@ -74,7 +74,7 @@ private static function createTaskAttributeTypes(ApplicationAbstract $app, array
         $taskAttrType = [];
 
         /** @var \Modules\Tasks\Controller\ApiAttributeController $module */
-        $module = $app->moduleManager->getModuleInstance('Tasks', 'ApiAttribute');
+        $module = $app->moduleManager->get('Tasks', 'ApiAttribute');
 
         /** @var array $attribute */
         foreach ($attributes as $attribute) {
@@ -142,7 +142,7 @@ private static function createTaskAttributeValues(ApplicationAbstract $app, arra
         $taskAttrValue = [];
 
          /** @var \Modules\Tasks\Controller\ApiAttributeController $module */
-         $module = $app->moduleManager->getModuleInstance('Tasks', 'ApiAttribute');
+         $module = $app->moduleManager->get('Tasks', 'ApiAttribute');
 
         foreach ($attributes as $attribute) {
             $taskAttrValue[$attribute['name']] = [];

diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
@@ -29,6 +29,17 @@
             ],
         ],
     ],
+    '^.*/task/list(\?.*$|$)' => [
+        [
+            'dest'       => '\Modules\Tasks\Controller\BackendController:viewTaskList',
+            'verb'       => RouteVerb::GET,
+            'permission' => [
+                'module' => BackendController::NAME,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionCategory::TASK,
+            ],
+        ],
+    ],
     '^.*/task/view(\?.*$|$)' => [
         [
             'dest'       => '\Modules\Tasks\Controller\BackendController:viewTaskView',

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md