summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/Controller/SubtaskController.php (renamed from app/Controller/Subtask.php)11
-rw-r--r--app/Controller/SubtaskRestrictionController.php (renamed from app/Controller/SubtaskRestriction.php)10
-rw-r--r--app/Controller/SubtaskStatusController.php (renamed from app/Controller/SubtaskStatus.php)4
-rw-r--r--app/Helper/SubtaskHelper.php6
-rw-r--r--app/ServiceProvider/AuthenticationProvider.php6
-rw-r--r--app/ServiceProvider/RouteProvider.php1
-rw-r--r--app/Template/subtask/create.php2
-rw-r--r--app/Template/subtask/edit.php2
-rw-r--r--app/Template/subtask/menu.php4
-rw-r--r--app/Template/subtask/remove.php2
-rw-r--r--app/Template/subtask/table.php6
-rw-r--r--app/Template/subtask_restriction/show.php (renamed from app/Template/subtask_restriction/popover.php)6
-rw-r--r--app/Template/task/dropdown.php2
-rw-r--r--app/Template/task/layout.php2
-rw-r--r--app/Template/task/sidebar.php2
15 files changed, 33 insertions, 33 deletions
diff --git a/app/Controller/Subtask.php b/app/Controller/SubtaskController.php
index dfe4415e..830548da 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
index bfa3031c..185371e7 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
index e22e825e..e24002dc 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 afa3c14e..dac71203 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 fbc10abf..193929c7 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 359bd220..2bf3b6db 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 029fddf5..31b99f90 100644
--- a/app/Template/subtask/create.php
+++ b/app/Template/subtask/create.php
@@ -2,7 +2,7 @@
<h2><?= t('Add a sub-task') ?></h2>
</div>
-<form class="popover-form" method="post" action="<?= $this->url->href('subtask', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('SubtaskController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>
<?= $this->form->hidden('task_id', $values) ?>
diff --git a/app/Template/subtask/edit.php b/app/Template/subtask/edit.php
index 3c210f60..9e316ea5 100644
--- a/app/Template/subtask/edit.php
+++ b/app/Template/subtask/edit.php
@@ -2,7 +2,7 @@
<h2><?= t('Edit a sub-task') ?></h2>
</div>
-<form class="popover-form" method="post" action="<?= $this->url->href('subtask', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>" autocomplete="off">
+<form class="popover-form" method="post" action="<?= $this->url->href('SubtaskController', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?>
<?= $this->form->hidden('id', $values) ?>
diff --git a/app/Template/subtask/menu.php b/app/Template/subtask/menu.php
index aa7b9a53..d5d1bf85 100644
--- a/app/Template/subtask/menu.php
+++ b/app/Template/subtask/menu.php
@@ -3,11 +3,11 @@
<ul>
<li>
<i class="fa fa-pencil-square-o" aria-hidden="true"></i>
- <?= $this->url->link(t('Edit'), 'subtask', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), false, 'popover') ?>
+ <?= $this->url->link(t('Edit'), 'SubtaskController', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), false, 'popover') ?>
</li>
<li>
<i class="fa fa-trash-o" aria-hidden="true"></i>
- <?= $this->url->link(t('Remove'), 'subtask', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), false, 'popover') ?>
+ <?= $this->url->link(t('Remove'), 'SubtaskController', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), false, 'popover') ?>
</li>
<li>
<i class="fa fa-clone" aria-hidden="true"></i>
diff --git a/app/Template/subtask/remove.php b/app/Template/subtask/remove.php
index 7ea43555..33c10e88 100644
--- a/app/Template/subtask/remove.php
+++ b/app/Template/subtask/remove.php
@@ -13,7 +13,7 @@
</div>
<div class="form-actions">
- <?= $this->url->link(t('Yes'), 'subtask', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?>
+ <?= $this->url->link(t('Yes'), 'SubtaskController', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
</div>
diff --git a/app/Template/subtask/table.php b/app/Template/subtask/table.php
index 40510a2f..4c6484ef 100644
--- a/app/Template/subtask/table.php
+++ b/app/Template/subtask/table.php
@@ -1,7 +1,7 @@
<?php if (! empty($subtasks)): ?>
<table
class="subtasks-table table-stripped"
- data-save-position-url="<?= $this->url->href('Subtask', 'movePosition', array('project_id' => $task['project_id'], 'task_id' => $task['id'])) ?>"
+ data-save-position-url="<?= $this->url->href('SubtaskController', 'movePosition', array('project_id' => $task['project_id'], 'task_id' => $task['id'])) ?>"
>
<thead>
<tr>
@@ -44,11 +44,11 @@
<li>
<?php if ($subtask['is_timer_started']): ?>
<i class="fa fa-pause"></i>
- <?= $this->url->link(t('Stop timer'), 'SubtaskStatus', 'timer', array('timer' => 'stop', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'subtask-toggle-timer') ?>
+ <?= $this->url->link(t('Stop timer'), 'SubtaskStatusController', 'timer', array('timer' => 'stop', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'subtask-toggle-timer') ?>
(<?= $this->dt->age($subtask['timer_start_date']) ?>)
<?php else: ?>
<i class="fa fa-play-circle-o"></i>
- <?= $this->url->link(t('Start timer'), 'SubtaskStatus', 'timer', array('timer' => 'start', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'subtask-toggle-timer') ?>
+ <?= $this->url->link(t('Start timer'), 'SubtaskStatusController', 'timer', array('timer' => 'start', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'subtask-toggle-timer') ?>
<?php endif ?>
</li>
<?php endif ?>
diff --git a/app/Template/subtask_restriction/popover.php b/app/Template/subtask_restriction/show.php
index 916a664e..1ff49915 100644
--- a/app/Template/subtask_restriction/popover.php
+++ b/app/Template/subtask_restriction/show.php
@@ -1,7 +1,7 @@
<div class="page-header">
<h2><?= t('You already have one subtask in progress') ?></h2>
</div>
-<form class="popover-form" action="<?= $this->url->href('SubtaskRestriction', 'update', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>" method="post">
+<form class="popover-form" action="<?= $this->url->href('SubtaskRestrictionController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>" method="post">
<?= $this->form->csrf() ?>
@@ -12,6 +12,6 @@
<div class="form-actions">
<button type="submit" class="btn btn-red"><?= t('Save') ?></button>
<?= t('or') ?>
- <a href="#" class="close-popover"><?= t('cancel') ?></a>
+ <?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
</div>
-</form> \ No newline at end of file
+</form>
diff --git a/app/Template/task/dropdown.php b/app/Template/task/dropdown.php
index 4be69851..887e1828 100644
--- a/app/Template/task/dropdown.php
+++ b/app/Template/task/dropdown.php
@@ -25,7 +25,7 @@
</li>
<li>
<i class="fa fa-plus fa-fw"></i>
- <?= $this->url->link(t('Add a sub-task'), 'subtask', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+ <?= $this->url->link(t('Add a sub-task'), 'SubtaskController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
</li>
<li>
<i class="fa fa-code-fork fa-fw"></i>
diff --git a/app/Template/task/layout.php b/app/Template/task/layout.php
index ba2cd8d5..4bc67406 100644
--- a/app/Template/task/layout.php
+++ b/app/Template/task/layout.php
@@ -5,7 +5,7 @@
class="sidebar-container" id="task-view"
data-edit-url="<?= $this->url->href('taskmodification', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
data-description-url="<?= $this->url->href('taskmodification', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
- data-subtask-url="<?= $this->url->href('subtask', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
+ data-subtask-url="<?= $this->url->href('SubtaskController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
data-internal-link-url="<?= $this->url->href('TaskInternalLink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"
data-comment-url="<?= $this->url->href('comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>">
diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php
index 46f9e1a2..3dc518b4 100644
--- a/app/Template/task/sidebar.php
+++ b/app/Template/task/sidebar.php
@@ -44,7 +44,7 @@
</li>
<li>
<i class="fa fa-plus fa-fw"></i>
- <?= $this->url->link(t('Add a sub-task'), 'subtask', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
+ <?= $this->url->link(t('Add a sub-task'), 'SubtaskController', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>
</li>
<li>
<i class="fa fa-code-fork fa-fw"></i>
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-22 21:33:50 +0000