Prevent people to remove columns that contains tasks

This commit is contained in:
Frederic Guillot
2017-02-08 18:36:13 -05:00
parent d3650eaa25
commit 73dce12797
33 changed files with 80 additions and 35 deletions

View File

@@ -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>

View File

@@ -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(