Merge pull-request #444, Allow click on subtask status icon to toggle

This commit is contained in:
Frédéric Guillot 2014-12-04 20:02:43 -05:00
commit 0f9ad1966a
2 changed files with 5 additions and 8 deletions

View File

@ -1,9 +1,7 @@
<section id="tooltip-subtasks">
<?php foreach ($subtasks as $subtask): ?>
<?= Helper\template('subtask/icons', array('subtask' => $subtask)) ?>
<?= Helper\a(
Helper\escape($subtask['title']),
trim(Helper\template('subtask/icons', array('subtask' => $subtask))) . Helper\escape($subtask['title']),
'board',
'toggleSubtask',
array('task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'])
@ -13,4 +11,4 @@
<br/>
<?php endforeach ?>
</section>
</section>

View File

@ -19,12 +19,11 @@
<tr>
<td><?= Helper\escape($subtask['title']) ?></td>
<td>
<?= Helper\template('subtask/icons', array('subtask' => $subtask)) ?>
<?php if (! isset($not_editable)): ?>
<?= Helper\a(Helper\escape($subtask['status_name']), 'subtask', 'toggleStatus', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>
<?= Helper\a(trim(Helper\template('subtask/icons', array('subtask' => $subtask))) . Helper\escape($subtask['status_name']),
'subtask', 'toggleStatus', array('task_id' => $task['id'], 'subtask_id' => $subtask['id'])) ?>
<?php else: ?>
<?= Helper\escape($subtask['status_name']) ?>
<?= Helper\template('subtask/icons', array('subtask' => $subtask)) . Helper\escape($subtask['status_name']) ?>
<?php endif ?>
</td>
<td>