diff --git a/app/Controller/Subtask.php b/app/Controller/SubtaskController.php similarity index 95% rename from app/Controller/Subtask.php rename to app/Controller/SubtaskController.php index dfe4415e2..830548da9 100644 --- a/app/Controller/Subtask.php +++ b/app/Controller/SubtaskController.php @@ -3,14 +3,15 @@ namespace Kanboard\Controller; use Kanboard\Core\Controller\AccessForbiddenException; +use Kanboard\Core\Controller\PageNotFoundException; /** * Subtask controller * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class Subtask extends BaseController +class SubtaskController extends BaseController { /** * Creation form @@ -19,7 +20,7 @@ class Subtask extends BaseController * @param array $values * @param array $errors * @throws AccessForbiddenException - * @throws \Kanboard\Core\Controller\PageNotFoundException + * @throws PageNotFoundException */ public function create(array $values = array(), array $errors = array()) { @@ -76,7 +77,7 @@ class Subtask extends BaseController * @param array $values * @param array $errors * @throws AccessForbiddenException - * @throws \Kanboard\Core\Controller\PageNotFoundException + * @throws PageNotFoundException */ public function edit(array $values = array(), array $errors = array()) { @@ -166,7 +167,7 @@ class Subtask extends BaseController $task_id = $this->request->getIntegerParam('task_id'); $values = $this->request->getJson(); - if (! empty($values) && $this->helper->user->hasProjectAccess('Subtask', 'movePosition', $project_id)) { + if (! empty($values) && $this->helper->user->hasProjectAccess('SubtaskController', 'movePosition', $project_id)) { $result = $this->subtask->changePosition($task_id, $values['subtask_id'], $values['position']); $this->response->json(array('result' => $result)); } else { diff --git a/app/Controller/SubtaskRestriction.php b/app/Controller/SubtaskRestrictionController.php similarity index 89% rename from app/Controller/SubtaskRestriction.php rename to app/Controller/SubtaskRestrictionController.php index bfa3031c6..185371e7a 100644 --- a/app/Controller/SubtaskRestriction.php +++ b/app/Controller/SubtaskRestrictionController.php @@ -7,22 +7,22 @@ use Kanboard\Model\Subtask as SubtaskModel; /** * Subtask Restriction * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class SubtaskRestriction extends BaseController +class SubtaskRestrictionController extends BaseController { /** * Show popup * * @access public */ - public function popover() + public function show() { $task = $this->getTask(); $subtask = $this->getSubtask(); - $this->response->html($this->template->render('subtask_restriction/popover', array( + $this->response->html($this->template->render('subtask_restriction/show', array( 'status_list' => array( SubtaskModel::STATUS_TODO => t('Todo'), SubtaskModel::STATUS_DONE => t('Done'), @@ -38,7 +38,7 @@ class SubtaskRestriction extends BaseController * * @access public */ - public function update() + public function save() { $task = $this->getTask(); $subtask = $this->getSubtask(); diff --git a/app/Controller/SubtaskStatus.php b/app/Controller/SubtaskStatusController.php similarity index 95% rename from app/Controller/SubtaskStatus.php rename to app/Controller/SubtaskStatusController.php index e22e825e9..e24002dc5 100644 --- a/app/Controller/SubtaskStatus.php +++ b/app/Controller/SubtaskStatusController.php @@ -5,10 +5,10 @@ namespace Kanboard\Controller; /** * Subtask Status * - * @package controller + * @package Kanboard\Controller * @author Frederic Guillot */ -class SubtaskStatus extends BaseController +class SubtaskStatusController extends BaseController { /** * Change status to the next status: Toto -> In Progress -> Done diff --git a/app/Helper/SubtaskHelper.php b/app/Helper/SubtaskHelper.php index afa3c14e8..dac712034 100644 --- a/app/Helper/SubtaskHelper.php +++ b/app/Helper/SubtaskHelper.php @@ -36,18 +36,18 @@ class SubtaskHelper extends Base */ public function toggleStatus(array $subtask, $project_id, $refresh_table = false) { - if (! $this->helper->user->hasProjectAccess('subtask', 'edit', $project_id)) { + if (! $this->helper->user->hasProjectAccess('SubtaskController', 'edit', $project_id)) { return $this->getTitle($subtask); } $params = array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'refresh-table' => (int) $refresh_table); if ($subtask['status'] == 0 && isset($this->sessionStorage->hasSubtaskInProgress) && $this->sessionStorage->hasSubtaskInProgress) { - return $this->helper->url->link($this->getTitle($subtask), 'SubtaskRestriction', 'popover', $params, false, 'popover'); + return $this->helper->url->link($this->getTitle($subtask), 'SubtaskRestrictionController', 'show', $params, false, 'popover'); } $class = 'subtask-toggle-status '.($refresh_table ? 'subtask-refresh-table' : ''); - return $this->helper->url->link($this->getTitle($subtask), 'SubtaskStatus', 'change', $params, false, $class); + return $this->helper->url->link($this->getTitle($subtask), 'SubtaskStatusController', 'change', $params, false, $class); } public function selectTitle(array $values, array $errors = array(), array $attributes = array()) diff --git a/app/ServiceProvider/AuthenticationProvider.php b/app/ServiceProvider/AuthenticationProvider.php index fbc10abf7..193929c73 100644 --- a/app/ServiceProvider/AuthenticationProvider.php +++ b/app/ServiceProvider/AuthenticationProvider.php @@ -86,9 +86,9 @@ class AuthenticationProvider implements ServiceProviderInterface $acl->add('ProjectEdit', '*', Role::PROJECT_MANAGER); $acl->add('ProjectFile', '*', Role::PROJECT_MEMBER); $acl->add('Projectuser', '*', Role::PROJECT_MANAGER); - $acl->add('Subtask', '*', Role::PROJECT_MEMBER); - $acl->add('SubtaskRestriction', '*', Role::PROJECT_MEMBER); - $acl->add('SubtaskStatus', '*', Role::PROJECT_MEMBER); + $acl->add('SubtaskController', '*', Role::PROJECT_MEMBER); + $acl->add('SubtaskRestrictionController', '*', Role::PROJECT_MEMBER); + $acl->add('SubtaskStatusController', '*', Role::PROJECT_MEMBER); $acl->add('Swimlane', '*', Role::PROJECT_MANAGER); $acl->add('Task', 'remove', Role::PROJECT_MEMBER); $acl->add('TaskCreationController', '*', Role::PROJECT_MEMBER); diff --git a/app/ServiceProvider/RouteProvider.php b/app/ServiceProvider/RouteProvider.php index 359bd2203..2bf3b6dbf 100644 --- a/app/ServiceProvider/RouteProvider.php +++ b/app/ServiceProvider/RouteProvider.php @@ -100,7 +100,6 @@ class RouteProvider implements ServiceProviderInterface $container['route']->addRoute('project/:project_id/task/:task_id/activity', 'activity', 'task'); $container['route']->addRoute('project/:project_id/task/:task_id/transitions', 'task', 'transitions'); $container['route']->addRoute('project/:project_id/task/:task_id/analytics', 'task', 'analytics'); - $container['route']->addRoute('project/:project_id/task/:task_id/subtasks', 'subtask', 'show'); $container['route']->addRoute('project/:project_id/task/:task_id/time-tracking', 'task', 'timetracking'); // Exports diff --git a/app/Template/subtask/create.php b/app/Template/subtask/create.php index 029fddf55..31b99f903 100644 --- a/app/Template/subtask/create.php +++ b/app/Template/subtask/create.php @@ -2,7 +2,7 @@

-
+ form->csrf() ?> form->hidden('task_id', $values) ?> diff --git a/app/Template/subtask/edit.php b/app/Template/subtask/edit.php index 3c210f60f..9e316ea53 100644 --- a/app/Template/subtask/edit.php +++ b/app/Template/subtask/edit.php @@ -2,7 +2,7 @@

- + form->csrf() ?> form->hidden('id', $values) ?> diff --git a/app/Template/subtask/menu.php b/app/Template/subtask/menu.php index aa7b9a537..d5d1bf856 100644 --- a/app/Template/subtask/menu.php +++ b/app/Template/subtask/menu.php @@ -3,11 +3,11 @@