Make sure that tags are duplicated for recurring tasks

This commit is contained in:
Frederic Guillot
2016-07-02 15:45:55 -04:00
parent b7ac354e83
commit 8e56148a6d
9 changed files with 139 additions and 129 deletions

View File

@@ -107,9 +107,9 @@ class BoardTooltipController extends BaseController
$this->response->html($this->template->render('task_recurrence/info', array(
'task' => $task,
'recurrence_trigger_list' => $this->taskModel->getRecurrenceTriggerList(),
'recurrence_timeframe_list' => $this->taskModel->getRecurrenceTimeframeList(),
'recurrence_basedate_list' => $this->taskModel->getRecurrenceBasedateList(),
'recurrence_trigger_list' => $this->taskRecurrenceModel->getRecurrenceTriggerList(),
'recurrence_timeframe_list' => $this->taskRecurrenceModel->getRecurrenceTimeframeList(),
'recurrence_basedate_list' => $this->taskRecurrenceModel->getRecurrenceBasedateList(),
)));
}

View File

@@ -31,10 +31,10 @@ class TaskRecurrenceController extends BaseController
'values' => $values,
'errors' => $errors,
'task' => $task,
'recurrence_status_list' => $this->taskModel->getRecurrenceStatusList(),
'recurrence_trigger_list' => $this->taskModel->getRecurrenceTriggerList(),
'recurrence_timeframe_list' => $this->taskModel->getRecurrenceTimeframeList(),
'recurrence_basedate_list' => $this->taskModel->getRecurrenceBasedateList(),
'recurrence_status_list' => $this->taskRecurrenceModel->getRecurrenceStatusList(),
'recurrence_trigger_list' => $this->taskRecurrenceModel->getRecurrenceTriggerList(),
'recurrence_timeframe_list' => $this->taskRecurrenceModel->getRecurrenceTimeframeList(),
'recurrence_basedate_list' => $this->taskRecurrenceModel->getRecurrenceBasedateList(),
)));
}