diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index fe8e374..c42f897 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -22,6 +22,7 @@ return [ [ 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskCreate', 'verb' => RouteVerb::PUT, + 'csrf' => true, 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, @@ -31,6 +32,7 @@ return [ [ 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskSet', 'verb' => RouteVerb::SET, + 'csrf' => true, 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, @@ -40,6 +42,7 @@ return [ [ 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskGet', 'verb' => RouteVerb::GET, + 'csrf' => true, 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::READ, @@ -51,6 +54,7 @@ return [ [ 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskReminderCreate', 'verb' => RouteVerb::PUT, + 'csrf' => true, 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, @@ -62,6 +66,7 @@ return [ [ 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementCreate', 'verb' => RouteVerb::PUT, + 'csrf' => true, 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, @@ -71,6 +76,7 @@ return [ [ 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementSet', 'verb' => RouteVerb::SET, + 'csrf' => true, 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, @@ -80,6 +86,7 @@ return [ [ 'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementGet', 'verb' => RouteVerb::GET, + 'csrf' => true, 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::READ, diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 673c5ec..7680167 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -184,13 +184,13 @@ final class BackendController extends Controller implements DashboardElementInte if ($request->getData('ptype') === 'p') { $view->data['tasks'] = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '<') - ->executeGetAll(); + ->executeGetArray(); } elseif ($request->getData('ptype') === 'n') { $view->data['tasks'] = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '>') - ->executeGetAll(); + ->executeGetArray(); } else { $view->data['tasks'] = $mapperQuery->where('id', 0, '>') - ->executeGetAll(); + ->executeGetArray(); } $view->data['task_media'] = []; diff --git a/Theme/Backend/task-analysis.tpl.php b/Theme/Backend/task-analysis.tpl.php index 2b245f3..aa5b81d 100755 --- a/Theme/Backend/task-analysis.tpl.php +++ b/Theme/Backend/task-analysis.tpl.php @@ -23,7 +23,7 @@ echo $this->data['nav']->render(); ?>
-
+
diff --git a/Theme/Backend/task-create.tpl.php b/Theme/Backend/task-create.tpl.php index 8b65a1e..9a75297 100755 --- a/Theme/Backend/task-create.tpl.php +++ b/Theme/Backend/task-create.tpl.php @@ -53,7 +53,7 @@ echo $this->data['nav']->render(); ?>
- +
@@ -80,7 +80,7 @@ echo $this->data['nav']->render(); ?>
-
+
diff --git a/Theme/Backend/task-list.tpl.php b/Theme/Backend/task-list.tpl.php index 0c41db3..7446ac7 100644 --- a/Theme/Backend/task-list.tpl.php +++ b/Theme/Backend/task-list.tpl.php @@ -22,8 +22,6 @@ $tasks = $this->data['tasks'] ?? []; $previous = empty($tasks) ? 'task/dashboard' : 'task/dashboard?{?}&id=' . \reset($tasks)->id . '&ptype=p'; $next = empty($tasks) ? 'task/dashboard' : 'task/dashboard?{?}&id=' . \end($tasks)->id . '&ptype=n'; -$open = $this->data['open']; - echo $this->data['nav']->render(); ?>
@@ -44,10 +42,6 @@ echo $this->data['nav']->render(); ?> $task) : - if ($open !== null && isset($open[$task->id])) { - continue; - } - ++$c; $url = UriFactory::build(empty($task->redirect) ? '{/base}/task/view?{?}&id=' . $task->id diff --git a/Theme/Backend/task-view.tpl.php b/Theme/Backend/task-view.tpl.php index d2a20ec..b00ff99 100644 --- a/Theme/Backend/task-view.tpl.php +++ b/Theme/Backend/task-view.tpl.php @@ -353,7 +353,7 @@ echo $this->data['nav']->render(); ?> 'plain', 'taskElementCreate', '', '', - '/content', '{/api}task?id={?id}' + '/content', '{/api}task?id={?id}&csrf={$CSRF}' ); ?>
@@ -410,7 +410,7 @@ echo $this->data['nav']->render(); ?>
-
+