diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Controller/TaskMovePositionController.php | 6 | ||||
| -rw-r--r-- | app/Template/task_move_position/show.php | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/Controller/TaskMovePositionController.php b/app/Controller/TaskMovePositionController.php index 1a8eee45..a655ca0a 100644 --- a/app/Controller/TaskMovePositionController.php +++ b/app/Controller/TaskMovePositionController.php @@ -4,6 +4,7 @@ namespace Kanboard\Controller; use Kanboard\Core\Controller\AccessForbiddenException; use Kanboard\Formatter\BoardFormatter; +use Kanboard\Model\TaskModel; /** * Class TaskMovePositionController @@ -21,7 +22,10 @@ class TaskMovePositionController extends BaseController 'task' => $task, 'board' => BoardFormatter::getInstance($this->container) ->withProjectId($task['project_id']) - ->withQuery($this->taskFinderModel->getExtendedQuery()) + ->withQuery($this->taskFinderModel->getExtendedQuery() + ->eq(TaskModel::TABLE.'.is_active', TaskModel::STATUS_OPEN) + ->neq(TaskModel::TABLE.'.id', $task['id']) + ) ->format() ))); } diff --git a/app/Template/task_move_position/show.php b/app/Template/task_move_position/show.php index 83cb3129..5fadff09 100644 --- a/app/Template/task_move_position/show.php +++ b/app/Template/task_move_position/show.php @@ -22,9 +22,7 @@ <div v-if="tasks.length > 0"> <?= $this->form->label(t('Position'), 'position') ?> <select v-model="position" id="form-position"> - <option v-for="task in tasks" v-bind:value="task.position"> - #{{ task.id }} - {{ task.title }} - </option> + <option v-for="task in tasks" v-bind:value="task.position">#{{ task.id }} - {{ task.title }}</option> </select> <label><input type="radio" value="before" v-model="positionChoice"><?= t('Insert before this task') ?></label> <label><input type="radio" value="after" v-model="positionChoice"><?= t('Insert after this task') ?></label> |