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

Minor tweaks on PR #3562

Browse Source
This commit is contained in:
Frédéric Guillot
2017-11-23 11:07:31 -08:00
parent 6c7c73613a
commit 5045c6d8de
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Formatter/BoardSwimlaneFormatter.php
View File

@@ -97,8 +97,8 @@ class BoardSwimlaneFormatter extends BaseFormatter implements FormatterInterface
$this->calculateStatsByColumnAcrossSwimlanes($swimlane['columns']); $this->calculateStatsByColumnAcrossSwimlanes($swimlane['columns']);
} }
foreach($this->swimlanes as &$swimlane) { foreach ($this->swimlanes as &$swimlane) {
foreach($swimlane['columns'] as $columnIndex => &$column) { foreach ($swimlane['columns'] as $columnIndex => &$column) {
$column['column_nb_tasks'] = $this->swimlanes[0]['columns'][$columnIndex]['column_nb_tasks']; $column['column_nb_tasks'] = $this->swimlanes[0]['columns'][$columnIndex]['column_nb_tasks'];
$column['column_nb_score'] = $this->swimlanes[0]['columns'][$columnIndex]['column_score']; $column['column_nb_score'] = $this->swimlanes[0]['columns'][$columnIndex]['column_score'];
} }

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

@@ -19,10 +19,11 @@
<?= $this->task->getNewBoardTaskButton($swimlane, $column) ?> <?= $this->task->getNewBoardTaskButton($swimlane, $column) ?>
<?php endif ?> <?php endif ?>
<?php if ($column['nb_tasks'] > 0): ?>
<span title="<?= t('Task count') ?>"> <span title="<?= t('Task count') ?>">
(<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>) (<span id="task-number-column-<?= $column['id'] ?>"><?= $column['nb_tasks'] ?></span>)
</span> </span>
<?php endif ?>
<span class="board-column-title"> <span class="board-column-title">
<?php if ($not_editable): ?> <?php if ($not_editable): ?>
@@ -76,14 +77,13 @@
<?php if (! empty($column['column_nb_tasks'])): ?> <?php if (! empty($column['column_nb_tasks'])): ?>
<span title="<?= t('Total number of tasks in this column across all swimlanes') ?>" class="board-column-header-task-count"> <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><?= $column['column_nb_tasks'] ?></span> / <span title="<?= t('Task limit') ?>"><?= $this->text->e($column['task_limit']) ?></span>)
<?php if ($column['task_limit']): ?> <?php else: ?>
/<span title="<?= t('Task limit') ?>"><?= $this->text->e($column['task_limit']) ?></span> (<span><?= $column['column_nb_tasks'] ?></span>)
<?php endif ?> <?php endif ?>
)
</span> </span>
<?php endif; ?> <?php endif ?>
<?= $this->hook->render('template:board:column:header', array('swimlane' => $swimlane, 'column' => $column)) ?> <?= $this->hook->render('template:board:column:header', array('swimlane' => $swimlane, 'column' => $column)) ?>
</div> </div>