Remove time form on task summary page and move that to task edit form

This commit is contained in:
Frederic Guillot
2016-02-05 19:00:40 -05:00
parent a683c17fa7
commit e2181612b9
10 changed files with 17 additions and 61 deletions

View File

@@ -2,6 +2,12 @@
<div class="dropdown">
<i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Actions') ?></a>
<ul>
<?php if (empty($task['date_started'])): ?>
<li>
<i class="fa fa-play fa-fw"></i>
<?= $this->url->link(t('Set automatically the start date'), 'taskmodification', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
</li>
<?php endif ?>
<li>
<i class="fa fa-pencil-square-o fa-fw"></i>
<?= $this->url->link(t('Edit the task'), 'taskmodification', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'popover') ?>

View File

@@ -1,16 +1,9 @@
<?= $this->render('task/details', array(
'task' => $task,
'project' => $project,
'recurrence_trigger_list' => $this->task->recurrenceTriggers(),
'recurrence_timeframe_list' => $this->task->recurrenceTimeframes(),
'recurrence_basedate_list' => $this->task->recurrenceBasedates(),
'editable' => $this->user->hasProjectAccess('taskmodification', 'edit', $project['id']),
)) ?>
<?php if ($this->user->hasProjectAccess('taskmodification', 'edit', $project['id'])): ?>
<?= $this->render('task_modification/edit_time', array('task' => $task, 'values' => $values, 'date_format' => $date_format, 'date_formats' => $date_formats)) ?>
<?php endif ?>
<?= $this->render('task/description', array('task' => $task)) ?>
<?= $this->render('subtask/show', array(