From 73dce1279760434e1d1b7a903a0a7500462d6f9c Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Wed, 8 Feb 2017 18:36:13 -0500
Subject: Prevent people to remove columns that contains tasks

---
 app/Template/column/index.php  | 14 ++++++++++++--
 app/Template/column/remove.php |  1 -
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'app/Template/column')

diff --git a/app/Template/column/index.php b/app/Template/column/index.php
index eaaae332..0b14e341 100644
--- a/app/Template/column/index.php
+++ b/app/Template/column/index.php
@@ -15,10 +15,12 @@
         data-save-position-url="<?= $this->url->href('ColumnController', 'move', array('project_id' => $project['id'])) ?>">
         <thead>
         <tr>
-            <th class="column-70"><?= t('Column title') ?></th>
+            <th class="column-40"><?= t('Column title') ?></th>
             <th class="column-10"><?= t('Task limit') ?></th>
             <th class="column-20"><?= t('Visible on dashboard') ?></th>
-            <th class="column-5"><?= t('Actions') ?></th>
+            <th class="column-10"><?= t('Open tasks') ?></th>
+            <th class="column-10"><?= t('Closed tasks') ?></th>
+            <th><?= t('Actions') ?></th>
         </tr>
         </thead>
         <tbody>
@@ -39,6 +41,12 @@
             <td>
                 <?= $column['hide_in_dashboard'] == 1 ? t('Yes') : t('No') ?>
             </td>
+            <td>
+                <?= $column['nb_open_tasks'] ?>
+            </td>
+            <td>
+                <?= $column['nb_closed_tasks'] ?>
+            </td>
             <td>
                 <div class="dropdown">
                 <a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
@@ -46,9 +54,11 @@
                     <li>
                         <?= $this->modal->medium('edit', t('Edit'), 'ColumnController', 'edit', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?>
                     </li>
+                    <?php if ($column['nb_open_tasks'] == 0 && $column['nb_closed_tasks'] == 0): ?>
                     <li>
                         <?= $this->modal->confirm('trash-o', t('Remove'), 'ColumnController', 'confirm', array('project_id' => $project['id'], 'column_id' => $column['id'])) ?>
                     </li>
+                    <?php endif ?>
                 </ul>
                 </div>
             </td>
diff --git a/app/Template/column/remove.php b/app/Template/column/remove.php
index 4134b175..b4e7942d 100644
--- a/app/Template/column/remove.php
+++ b/app/Template/column/remove.php
@@ -5,7 +5,6 @@
 <div class="confirm">
     <p class="alert alert-info">
         <?= t('Do you really want to remove this column: "%s"?', $column['title']) ?>
-        <?= t('This action will REMOVE ALL TASKS associated to this column!') ?>
     </p>
 
     <?= $this->modal->confirmButtons(
-- 
cgit v1.2.3