summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--app/Helper/TaskHelper.php26
-rw-r--r--app/Template/board/task_footer.php2
-rw-r--r--app/Template/project_edit/show.php1
-rw-r--r--app/Template/task_list/task_icons.php2
-rw-r--r--tests/units/Helper/TaskHelperTest.php11
6 files changed, 16 insertions, 27 deletions
diff --git a/ChangeLog b/ChangeLog
index 08b293bb..75537485 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ New features:
Improvements:
* Change users list layout
+* Project priority is always rendered now
Version 1.0.40 (Feb 24 2017)
----------------------------
diff --git a/app/Helper/TaskHelper.php b/app/Helper/TaskHelper.php
index 9484a479..69520c03 100644
--- a/app/Helper/TaskHelper.php
+++ b/app/Helper/TaskHelper.php
@@ -143,16 +143,12 @@ class TaskHelper extends Base
public function renderPriorityField(array $project, array $values)
{
- $html = '';
-
- if ($project['priority_end'] != $project['priority_start']) {
- $range = range($project['priority_start'], $project['priority_end']);
- $options = array_combine($range, $range);
- $values += array('priority' => $project['priority_default']);
+ $range = range($project['priority_start'], $project['priority_end']);
+ $options = array_combine($range, $range);
+ $values += array('priority' => $project['priority_default']);
- $html .= $this->helper->form->label(t('Priority'), 'priority');
- $html .= $this->helper->form->select('priority', $options, $values, array(), array('tabindex="7"'));
- }
+ $html = $this->helper->form->label(t('Priority'), 'priority');
+ $html .= $this->helper->form->select('priority', $options, $values, array(), array('tabindex="7"'));
return $html;
}
@@ -211,15 +207,11 @@ class TaskHelper extends Base
return $this->helper->form->date(t('Due Date'), 'date_due', $values, $errors, $attributes);
}
- public function formatPriority(array $project, array $task)
+ public function renderPriority($priority)
{
- $html = '';
-
- if ($project['priority_end'] != $project['priority_start']) {
- $html .= '<span class="task-board-priority" title="'.t('Task priority').'">';
- $html .= $task['priority'] >= 0 ? 'P'.$task['priority'] : '-P'.abs($task['priority']);
- $html .= '</span>';
- }
+ $html = '<span class="task-priority" title="'.t('Task priority').'">';
+ $html .= $this->helper->text->e($priority >= 0 ? 'P'.$priority : '-P'.abs($priority));
+ $html .= '</span>';
return $html;
}
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index 79b7c3e9..1ad1c9f1 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -125,7 +125,7 @@
<span class="task-board-closed"><i class="fa fa-ban fa-fw"></i><?= t('Closed') ?></span>
<?php endif ?>
- <?= $this->task->formatPriority($project, $task) ?>
+ <?= $this->task->renderPriority($task['priority']) ?>
<?= $this->hook->render('template:board:task:icons', array('task' => $task)) ?>
</div>
diff --git a/app/Template/project_edit/show.php b/app/Template/project_edit/show.php
index 074f1d37..62bd9af6 100644
--- a/app/Template/project_edit/show.php
+++ b/app/Template/project_edit/show.php
@@ -61,7 +61,6 @@
<?= $this->form->label(t('Highest priority'), 'priority_end') ?>
<?= $this->form->number('priority_end', $values, $errors, array('tabindex="10"')) ?>
- <p class="form-help"><?= t('If you put zero to the low and high priority, this feature will be disabled.') ?></p>
</fieldset>
<?= $this->modal->submitButtons(array('tabindex' => 11)) ?>
diff --git a/app/Template/task_list/task_icons.php b/app/Template/task_list/task_icons.php
index da08a43f..8694d147 100644
--- a/app/Template/task_list/task_icons.php
+++ b/app/Template/task_list/task_icons.php
@@ -90,5 +90,5 @@
<span class="task-board-closed"><i class="fa fa-ban fa-fw"></i><?= t('Closed') ?></span>
<?php endif ?>
- <?= $this->task->formatPriority($project, $task) ?>
+ <?= $this->task->renderPriority($task['priority']) ?>
</div>
diff --git a/tests/units/Helper/TaskHelperTest.php b/tests/units/Helper/TaskHelperTest.php
index 8609983e..d2bd6ea9 100644
--- a/tests/units/Helper/TaskHelperTest.php
+++ b/tests/units/Helper/TaskHelperTest.php
@@ -11,7 +11,6 @@ class TaskHelperTest extends Base
$helper = new TaskHelper($this->container);
$this->assertNotEmpty($helper->renderPriorityField(array('priority_end' => '1', 'priority_start' => '5', 'priority_default' => '2'), array()));
$this->assertNotEmpty($helper->renderPriorityField(array('priority_end' => '3', 'priority_start' => '1', 'priority_default' => '2'), array()));
- $this->assertEmpty($helper->renderPriorityField(array('priority_end' => '3', 'priority_start' => '3', 'priority_default' => '2'), array()));
}
public function testFormatPriority()
@@ -19,15 +18,13 @@ class TaskHelperTest extends Base
$helper = new TaskHelper($this->container);
$this->assertEquals(
- '<span class="task-board-priority" title="Task priority">P2</span>',
- $helper->formatPriority(array('priority_end' => '3', 'priority_start' => '1', 'priority_default' => '2'), array('priority' => 2))
+ '<span class="task-priority" title="Task priority">P2</span>',
+ $helper->renderPriority(2)
);
$this->assertEquals(
- '<span class="task-board-priority" title="Task priority">-P6</span>',
- $helper->formatPriority(array('priority_end' => '3', 'priority_start' => '1', 'priority_default' => '2'), array('priority' => -6))
+ '<span class="task-priority" title="Task priority">-P6</span>',
+ $helper->renderPriority(-6)
);
-
- $this->assertEmpty($helper->formatPriority(array('priority_end' => '3', 'priority_start' => '3', 'priority_default' => '2'), array()));
}
}