From 54449d48c45b87699a796ca71b42c42a95dd9b8d Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 18 Apr 2015 15:10:40 -0400
Subject: Fix bug when moving subtasks with non consecutive positions

---
 app/Template/subtask/show.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'app/Template/subtask')

diff --git a/app/Template/subtask/show.php b/app/Template/subtask/show.php
index c7ac652a..e5368265 100644
--- a/app/Template/subtask/show.php
+++ b/app/Template/subtask/show.php
@@ -1,4 +1,8 @@
 <?php if (! empty($subtasks)): ?>
+
+<?php $first_position = $subtasks[0]['position']; ?>
+<?php $last_position = $subtasks[count($subtasks) - 1]['position']; ?>
+
 <div id="subtasks" class="task-show-section">
 
     <div class="page-header">
@@ -40,12 +44,12 @@
             <?php if (! isset($not_editable)): ?>
                 <td>
                     <ul>
-                        <?php if ($subtask['position'] > 1): ?>
+                        <?php if ($subtask['position'] != $first_position): ?>
                             <li>
                                 <?= $this->a(t('Move Up'), 'subtask', 'movePosition', array('project_id' => $project['id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'direction' => 'up'), true) ?>
                             </li>
                         <?php endif ?>
-                        <?php if ($subtask['position'] != 0 && $subtask['position'] != count($subtasks)): ?>
+                        <?php if ($subtask['position'] != $last_position): ?>
                             <li>
                                 <?= $this->a(t('Move Down'), 'subtask', 'movePosition', array('project_id' => $project['id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'], 'direction' => 'down'), true) ?>
                             </li>
-- 
cgit v1.2.3