Added the possibility to convert a subtask to a task

This commit is contained in:
Frederic Guillot
2016-05-17 22:08:57 -04:00
parent d8472d17bd
commit 996997a12d
7 changed files with 126 additions and 5 deletions

View File

@@ -2,10 +2,16 @@
<a href="#" class="dropdown-menu dropdown-menu-link-icon"><i class="fa fa-cog fa-fw"></i><i class="fa fa-caret-down"></i></a>
<ul>
<li>
<i class="fa fa-pencil-square-o" aria-hidden="true"></i>
<?= $this->url->link(t('Edit'), 'subtask', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), false, 'popover') ?>
</li>
<li>
<i class="fa fa-trash-o" aria-hidden="true"></i>
<?= $this->url->link(t('Remove'), 'subtask', 'confirm', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), false, 'popover') ?>
</li>
<li>
<i class="fa fa-clone" aria-hidden="true"></i>
<?= $this->url->link(t('Convert to task'), 'SubtaskConverterController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), false, 'popover') ?>
</li>
</ul>
</div>

View File

@@ -3,15 +3,18 @@
</div>
<div class="confirm">
<p class="alert alert-info">
<div class="alert alert-info">
<?= t('Do you really want to remove this sub-task?') ?>
</p>
<p><strong><?= $this->text->e($subtask['title']) ?></strong></p>
<ul>
<li>
<strong><?= $this->text->e($subtask['title']) ?></strong>
</li>
</ul>
</div>
<div class="form-actions">
<?= $this->url->link(t('Yes'), 'subtask', 'remove', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
</div>
</div>
</div>

View File

@@ -0,0 +1,20 @@
<div class="page-header">
<h2><?= t('Convert sub-task to task') ?></h2>
</div>
<div class="confirm">
<div class="alert alert-info">
<?= t('Do you really want to convert this sub-task to a task?') ?>
<ul>
<li>
<strong><?= $this->text->e($subtask['title']) ?></strong>
</li>
</ul>
</div>
<div class="form-actions">
<?= $this->url->link(t('Yes'), 'SubtaskConverterController', 'save', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'subtask_id' => $subtask['id']), true, 'btn btn-red') ?>
<?= t('or') ?>
<?= $this->url->link(t('cancel'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'close-popover') ?>
</div>
</div>