diff options
Diffstat (limited to 'app/Template/subtask')
| -rw-r--r-- | app/Template/subtask/edit.php | 3 | ||||
| -rw-r--r-- | app/Template/subtask/restriction_change_status.php | 19 | ||||
| -rw-r--r-- | app/Template/subtask/show.php | 5 |
3 files changed, 21 insertions, 6 deletions
diff --git a/app/Template/subtask/edit.php b/app/Template/subtask/edit.php index 8350dc09..f34d9532 100644 --- a/app/Template/subtask/edit.php +++ b/app/Template/subtask/edit.php @@ -12,9 +12,6 @@ <?= $this->formLabel(t('Title'), 'title') ?> <?= $this->formText('title', $values, $errors, array('required', 'autofocus', 'maxlength="50"')) ?><br/> - <?= $this->formLabel(t('Status'), 'status') ?> - <?= $this->formSelect('status', $status_list, $values, $errors) ?><br/> - <?= $this->formLabel(t('Assignee'), 'user_id') ?> <?= $this->formSelect('user_id', $users_list, $values, $errors) ?><br/> diff --git a/app/Template/subtask/restriction_change_status.php b/app/Template/subtask/restriction_change_status.php new file mode 100644 index 00000000..99e022f8 --- /dev/null +++ b/app/Template/subtask/restriction_change_status.php @@ -0,0 +1,19 @@ +<div class="page-header"> + <h2><?= t('You already have one subtask in progress') ?></h2> +</div> + + <form action="<?= $this->u('subtask', 'changeRestrictionStatus', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?>" method="post"> + + <?= $this->formCsrf() ?> + <?= $this->formHidden('redirect', array('redirect' => $redirect)) ?> + + <p><?= t('Select the new status of the subtask: "%s"', $subtask_inprogress['title']) ?></p> + <?= $this->formRadios('status', $status_list) ?> + <?= $this->formHidden('id', $subtask_inprogress) ?> + + <div class="form-actions"> + <input type="submit" value="<?= t('Save') ?>" class="btn btn-red"/> + <?= t('or') ?> + <a href="#" class="close-popover"><?= t('cancel') ?></a> + </div> +</form>
\ No newline at end of file diff --git a/app/Template/subtask/show.php b/app/Template/subtask/show.php index 265883b7..6d4533d2 100644 --- a/app/Template/subtask/show.php +++ b/app/Template/subtask/show.php @@ -20,15 +20,14 @@ <td><?= $this->e($subtask['title']) ?></td> <td> <?php if (! isset($not_editable)): ?> - <?= $this->a(trim($this->render('subtask/icons', array('subtask' => $subtask))) . $this->e($subtask['status_name']), - 'subtask', 'toggleStatus', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id'])) ?> + <?= $this->toggleSubtaskStatus($subtask, 'task') ?> <?php else: ?> <?= $this->render('subtask/icons', array('subtask' => $subtask)) . $this->e($subtask['status_name']) ?> <?php endif ?> </td> <td> <?php if (! empty($subtask['username'])): ?> - <?= $this->e($subtask['name'] ?: $subtask['username']) ?> + <?= $this->a($this->e($subtask['name'] ?: $subtask['username']), 'user', 'show', array('user_id' => $subtask['user_id'])) ?> <?php endif ?> </td> <td> |