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

Project priority is always rendered now

Browse Source
This commit is contained in:
Frederic Guillot
2017-02-26 14:34:03 -05:00
parent 27328255cd
commit 9bcf97a6c9
6 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/Helper/TaskHelper.php
View File

@@ -143,16 +143,12 @@ class TaskHelper extends Base
public function renderPriorityField(array $project, array $values)
{
$html = '';
$range = range($project['priority_start'], $project['priority_end']);
$options = array_combine($range, $range);
$values += array('priority' => $project['priority_default']);
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']);
$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;
}