AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle modification of external tasks

Browse Source
This commit is contained in:
Frederic Guillot
2016-11-07 21:26:55 -05:00
parent e5c63f4ecc
commit 83f529008a
5 changed files with 97 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controller/ExternalTaskCreationController.php
View File

@@ -44,7 +44,7 @@ class ExternalTaskCreationController extends BaseController
if (empty($values)) {
$values = $this->request->getValues();
$externalTask = $taskProvider->retrieve($taskProvider->buildTaskUri($values));
$externalTask = $taskProvider->fetch($taskProvider->buildTaskUri($values));
$values = $externalTask->getFormValues() + array(
'external_uri' => $externalTask->getUri(),
@@ -56,7 +56,7 @@ class ExternalTaskCreationController extends BaseController
'owner_id' => $this->userSession->getId(),
);
} else {
$externalTask = $taskProvider->retrieve($values['external_uri']);
$externalTask = $taskProvider->fetch($values['external_uri']);
}
$this->response->html($this->template->render('external_task_creation/step2', array(

2
app/Controller/ExternalTaskViewController.php
View File

@@ -17,7 +17,7 @@ class ExternalTaskViewController extends BaseController
try {
$task = $this->getTask();
$taskProvider = $this->externalTaskManager->getProvider($task['external_provider']);
$externalTask = $taskProvider->retrieve($task['external_uri']);
$externalTask = $taskProvider->fetch($task['external_uri']);
$this->response->html($this->template->render($taskProvider->getViewTemplate(), array(
'task' => $task,

51
app/Controller/TaskModificationController.php
View File

@@ -2,6 +2,10 @@
namespace Kanboard\Controller;
use Kanboard\Core\Controller\AccessForbiddenException;
use Kanboard\Core\ExternalTask\AccessForbiddenException as ExternalTaskAccessForbiddenException;
use Kanboard\Core\ExternalTask\ExternalTaskException;
/**
* Task Modification controller
*
@@ -43,7 +47,7 @@ class TaskModificationController extends BaseController
$values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values));
$values = $this->hook->merge('controller:task-modification:form:default', $values, array('default_values' => $values));
$this->response->html($this->template->render('task_modification/show', array(
$params = array(
'project' => $project,
'values' => $values,
'errors' => $errors,
@@ -51,7 +55,29 @@ class TaskModificationController extends BaseController
'tags' => $this->taskTagModel->getList($task['id']),
'users_list' => $this->projectUserRoleModel->getAssignableUsersList($task['project_id']),
'categories_list' => $this->categoryModel->getList($task['project_id']),
)));
);
$this->renderTemplate($task, $params);
}
protected function renderTemplate(array &$task, array &$params)
{
if (empty($task['external_uri'])) {
$this->response->html($this->template->render('task_modification/show', $params));
} else {
try {
$taskProvider = $this->externalTaskManager->getProvider($task['external_provider']);
$params['template'] = $taskProvider->getModificationFormTemplate();
$params['external_task'] = $taskProvider->fetch($task['external_uri']);
} catch (ExternalTaskAccessForbiddenException $e) {
throw new AccessForbiddenException($e->getMessage());
} catch (ExternalTaskException $e) {
$params['error_message'] = $e->getMessage();
}
$this->response->html($this->template->render('external_task_modification/show', $params));
}
}
/**
@@ -66,7 +92,7 @@ class TaskModificationController extends BaseController
list($valid, $errors) = $this->taskValidator->validateModification($values);
if ($valid && $this->taskModificationModel->update($values)) {
if ($valid && $this->updateTask($task, $values, $errors)) {
$this->flash->success(t('Task updated successfully.'));
$this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true);
} else {
@@ -74,4 +100,23 @@ class TaskModificationController extends BaseController
$this->edit($values, $errors);
}
}
protected function updateTask(array &$task, array &$values, array &$errors)
{
$result = $this->taskModificationModel->update($values);
if ($result && ! empty($task['external_uri'])) {
try {
$taskProvider = $this->externalTaskManager->getProvider($task['external_provider']);
$result = $taskProvider->save($task['external_uri'], $values, $errors);
} catch (ExternalTaskAccessForbiddenException $e) {
throw new AccessForbiddenException($e->getMessage());
} catch (ExternalTaskException $e) {
$this->logger->error($e->getMessage());
$result = false;
}
}
return $result;
}
}