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

Add project ID to ExternalTaskProviderInterface::fetch()

Browse Source
This commit is contained in:
Frédéric Guillot
2019-07-30 11:59:51 -07:00
committed by Frédéric Guillot
parent db0d680e5c
commit 216f2dee12
4 changed files with 6 additions and 5 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)) { if (empty($values)) {
$values = $this->request->getValues(); $values = $this->request->getValues();
$externalTask = $taskProvider->fetch($taskProvider->buildTaskUri($values)); $externalTask = $taskProvider->fetch($taskProvider->buildTaskUri($values), $project['id']);
$values = $externalTask->getFormValues() + array( $values = $externalTask->getFormValues() + array(
'external_uri' => $externalTask->getUri(), 'external_uri' => $externalTask->getUri(),
@@ -56,7 +56,7 @@ class ExternalTaskCreationController extends BaseController
'owner_id' => $this->userSession->getId(), 'owner_id' => $this->userSession->getId(),
); );
} else { } else {
$externalTask = $taskProvider->fetch($values['external_uri']); $externalTask = $taskProvider->fetch($values['external_uri'], $project['id']);
} }
$this->response->html($this->template->render('external_task_creation/step2', array( $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 { try {
$task = $this->getTask(); $task = $this->getTask();
$taskProvider = $this->externalTaskManager->getProvider($task['external_provider']); $taskProvider = $this->externalTaskManager->getProvider($task['external_provider']);
$externalTask = $taskProvider->fetch($task['external_uri']); $externalTask = $taskProvider->fetch($task['external_uri'], $task['project_id']);
$this->response->html($this->template->render($taskProvider->getViewTemplate(), array( $this->response->html($this->template->render($taskProvider->getViewTemplate(), array(
'task' => $task, 'task' => $task,

2
app/Controller/TaskModificationController.php
View File

@@ -117,7 +117,7 @@ class TaskModificationController extends BaseController
try { try {
$taskProvider = $this->externalTaskManager->getProvider($task['external_provider']); $taskProvider = $this->externalTaskManager->getProvider($task['external_provider']);
$params['template'] = $taskProvider->getModificationFormTemplate(); $params['template'] = $taskProvider->getModificationFormTemplate();
$params['external_task'] = $taskProvider->fetch($task['external_uri']); $params['external_task'] = $taskProvider->fetch($task['external_uri'], $task['project_id']);
} catch (ExternalTaskAccessForbiddenException $e) { } catch (ExternalTaskAccessForbiddenException $e) {
throw new AccessForbiddenException($e->getMessage()); throw new AccessForbiddenException($e->getMessage());
} catch (ExternalTaskException $e) { } catch (ExternalTaskException $e) {

3
app/Core/ExternalTask/ExternalTaskProviderInterface.php
View File

@@ -40,9 +40,10 @@ interface ExternalTaskProviderInterface
* @access public * @access public
* @throws \Kanboard\Core\ExternalTask\ExternalTaskException * @throws \Kanboard\Core\ExternalTask\ExternalTaskException
* @param string $uri * @param string $uri
* @param int $projectID
* @return ExternalTaskInterface * @return ExternalTaskInterface
*/ */
public function fetch($uri); public function fetch($uri, $projectID);
/** /**
* Save external task to another system * Save external task to another system