AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The task limit should consider all open tasks (not only filtered tasks)

Browse Source 
Fixes #4291
This commit is contained in:
Timo
2019-10-02 05:33:45 +02:00
committed by Frédéric Guillot
parent 91194776cf
commit 219c933832
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Template/board/table_column.php
View File

@@ -99,12 +99,12 @@
<?php endif ?>
</span>
<?php if (! empty($column['column_nb_tasks'])): ?>
<?php if (! empty($column['column_nb_open_tasks'])): ?>
<span title="<?= t('Total number of tasks in this column across all swimlanes') ?>" class="board-column-header-task-count">
<?php if ($column['task_limit'] > 0): ?>
(<span><?= $column['column_nb_tasks'] ?></span> / <span title="<?= t('Task limit') ?>"><?= $this->text->e($column['task_limit']) ?></span>)
(<span><?= $column['column_nb_open_tasks'] ?></span> / <span title="<?= t('Task limit') ?>"><?= $this->text->e($column['task_limit']) ?></span>)
<?php else: ?>
(<span><?= $column['column_nb_tasks'] ?></span>)
(<span><?= $column['column_nb_open_tasks'] ?></span>)
<?php endif ?>
</span>
<?php endif ?>

2
app/Template/board/table_tasks.php
View File

@@ -3,7 +3,7 @@
<?php foreach ($swimlane['columns'] as $column): ?>
<td class="
board-column-<?= $column['id'] ?>
<?= $column['task_limit'] > 0 && $column['column_nb_tasks'] > $column['task_limit'] ? 'board-task-list-limit' : '' ?>
<?= $column['task_limit'] > 0 && $column['column_nb_open_tasks'] > $column['task_limit'] ? 'board-task-list-limit' : '' ?>
"
>