Improve project move view

2 files changed, 21 insertions, 12 deletions

diff --git a/app/Controller/Task.php b/app/Controller/Task.php
index 0fc42ce4..6936185f 100644
--- a/app/Controller/Task.php
+++ b/app/Controller/Task.php
@@ -436,6 +436,9 @@ class Task extends Base
         $task = $this->getTask();
         $values = $task;
         $errors = array();
+        $projects_list = $this->project->getAvailableList($this->acl->getUserId());
+
+        unset($projects_list[$task['project_id']]);
 
         if ($this->request->isPost()) {
 
@@ -457,7 +460,7 @@ class Task extends Base
             'values' => $values,
             'errors' => $errors,
             'task' => $task,
-            'projects_list' => $this->project->getAvailableList($this->acl->getUserId()),
+            'projects_list' => $projects_list,
             'menu' => 'tasks',
             'title' => t('Move the task to another project')
         )));
diff --git a/app/Templates/task_move_project.php b/app/Templates/task_move_project.php
index 190a93d9..3bc3bcb8 100644
--- a/app/Templates/task_move_project.php
+++ b/app/Templates/task_move_project.php
@@ -2,17 +2,23 @@
     <h2><?= t('Move the task to another project') ?></h2>
 </div>
 
-<form method="post" action="?controller=task&amp;action=move&amp;task_id=<?= $task['id'] ?>&amp;project_id=<?= $task['project_id'] ?>" autocomplete="off">
+<?php if (empty($projects_list)): ?>
+    <p class="alert"><?= t('No project') ?></p>
+<?php else: ?>
 
-    <?= Helper\form_csrf() ?>
+    <form method="post" action="?controller=task&amp;action=move&amp;task_id=<?= $task['id'] ?>&amp;project_id=<?= $task['project_id'] ?>" autocomplete="off">
 
-    <?= Helper\form_hidden('id', $values) ?>
-    <?= Helper\form_label(t('Project'), 'project_id') ?>
-    <?= Helper\form_select('project_id', $projects_list, $values, $errors) ?><br/>
+        <?= Helper\form_csrf() ?>
 
-    <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
-        <?= t('or') ?>
-        <a href="?controller=board&amp;action=show&amp;project_id=<?= $task['project_id'] ?>"><?= t('cancel') ?></a>
-    </div>
-</form>
\ No newline at end of file
+        <?= Helper\form_hidden('id', $values) ?>
+        <?= Helper\form_label(t('Project'), 'project_id') ?>
+        <?= Helper\form_select('project_id', $projects_list, $values, $errors) ?><br/>
+
+        <div class="form-actions">
+            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+            <?= t('or') ?>
+            <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>"><?= t('cancel') ?></a>
+        </div>
+    </form>
+
+<?php endif ?>
\ No newline at end of file