Do not show closed tasks in task move position form

This commit is contained in:
Frederic Guillot
2016-10-05 20:37:51 -04:00
parent 9159be81ec
commit 4cc856344f
4 changed files with 12 additions and 6 deletions

View File

@@ -4,6 +4,7 @@ namespace Kanboard\Controller;
use Kanboard\Core\Controller\AccessForbiddenException; use Kanboard\Core\Controller\AccessForbiddenException;
use Kanboard\Formatter\BoardFormatter; use Kanboard\Formatter\BoardFormatter;
use Kanboard\Model\TaskModel;
/** /**
* Class TaskMovePositionController * Class TaskMovePositionController
@@ -21,7 +22,10 @@ class TaskMovePositionController extends BaseController
'task' => $task, 'task' => $task,
'board' => BoardFormatter::getInstance($this->container) 'board' => BoardFormatter::getInstance($this->container)
->withProjectId($task['project_id']) ->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() ->format()
))); )));
} }

View File

@@ -22,9 +22,7 @@
<div v-if="tasks.length > 0"> <div v-if="tasks.length > 0">
<?= $this->form->label(t('Position'), 'position') ?> <?= $this->form->label(t('Position'), 'position') ?>
<select v-model="position" id="form-position"> <select v-model="position" id="form-position">
<option v-for="task in tasks" v-bind:value="task.position"> <option v-for="task in tasks" v-bind:value="task.position">#{{ task.id }} - {{ task.title }}</option>
#{{ task.id }} - {{ task.title }}
</option>
</select> </select>
<label><input type="radio" value="before" v-model="positionChoice"><?= t('Insert before this task') ?></label> <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> <label><input type="radio" value="after" v-model="positionChoice"><?= t('Insert after this task') ?></label>

File diff suppressed because one or more lines are too long

View File

@@ -42,6 +42,10 @@ Vue.component('task-move-position', {
this.columns.forEach(function(column) { this.columns.forEach(function(column) {
if (column.id == self.columnId) { if (column.id == self.columnId) {
self.tasks = column.tasks; self.tasks = column.tasks;
if (self.tasks.length > 0) {
self.position = parseInt(self.tasks[0]['position']);
}
} }
}); });
}, },