AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix subtask redirection

This commit is contained in:
Frederic Guillot 2016-02-07 09:34:05 -05:00
parent 3fa445fce4
commit 07dd8882e8
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Controller/Subtask.php
View File

@ -23,6 +23,7 @@ class Subtask extends Base
'project' => $this->getProject(),
'subtasks' => $this->subtask->getAll($task['id']),
'editable' => true,
'redirect' => 'subtask',
)));
}

5
app/ServiceProvider/RouteProvider.php
View File

@ -135,11 +135,6 @@ class RouteProvider implements ServiceProviderInterface
$container['route']->addRoute('gantt/:project_id', 'gantt', 'project');
$container['route']->addRoute('gantt/:project_id/sort/:sorting', 'gantt', 'project');
// Subtask routes
$container['route']->addRoute('project/:project_id/task/:task_id/subtask/create', 'subtask', 'create');
$container['route']->addRoute('project/:project_id/task/:task_id/subtask/:subtask_id/remove', 'subtask', 'confirm');
$container['route']->addRoute('project/:project_id/task/:task_id/subtask/:subtask_id/edit', 'subtask', 'edit');
// Feed routes
$container['route']->addRoute('feed/project/:token', 'feed', 'project');
$container['route']->addRoute('feed/user/:token', 'feed', 'user');

4
app/Template/subtask/menu.php
View File

@ -3,12 +3,12 @@
<ul>
<?php if ($subtask['position'] != $first_position): ?>
<li>
<?= $this->url->link(t('Move Up'), 'subtask', 'movePosition', array('project_id' => $task['id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'direction' => 'up'), true) ?>
<?= $this->url->link(t('Move Up'), 'subtask', 'movePosition', array('project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'direction' => 'up', 'redirect' => $redirect), true) ?>
</li>
<?php endif ?>
<?php if ($subtask['position'] != $last_position): ?>
<li>
<?= $this->url->link(t('Move Down'), 'subtask', 'movePosition', array('project_id' => $task['id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'direction' => 'down'), true) ?>
<?= $this->url->link(t('Move Down'), 'subtask', 'movePosition', array('project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'direction' => 'down', 'redirect' => $redirect), true) ?>
</li>
<?php endif ?>
<li>

2
app/Template/subtask/show.php
View File

@ -4,7 +4,7 @@
<div id="subtasks">
<?= $this->render('subtask/table', array('subtasks' => $subtasks, 'task' => $task, 'editable' => $editable)) ?>
<?= $this->render('subtask/table', array('subtasks' => $subtasks, 'task' => $task, 'editable' => $editable, 'redirect' => $redirect)) ?>
<?php if ($editable && $this->user->hasProjectAccess('subtask', 'save', $task['project_id'])): ?>
<form method="post" action="<?= $this->url->href('subtask', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>" autocomplete="off">

1
app/Template/subtask/table.php
View File

@ -58,6 +58,7 @@
'subtask' => $subtask,
'first_position' => $first_position,
'last_position' => $last_position,
'redirect' => $redirect,
)) ?>
</td>
<?php endif ?>

1
app/Template/task/show.php
View File

@ -12,6 +12,7 @@
'project' => $project,
'users_list' => isset($users_list) ? $users_list : array(),
'editable' => true,
'redirect' => 'task',
)) ?>
<?= $this->render('tasklink/show', array(