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

Added internal task links to activity stream

Browse Source
This commit is contained in:
Frederic Guillot
2016-07-23 14:05:15 -04:00
parent 5fe81ae6ef
commit b6119e7dee
25 changed files with 684 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Action/TaskAssignCategoryLink.php
View File

@@ -60,8 +60,10 @@ class TaskAssignCategoryLink extends Base
public function getEventRequiredParameters()
{
return array(
'task_id',
'link_id',
'task_link' => array(
'task_id',
'link_id',
)
);
}
@@ -75,7 +77,7 @@ class TaskAssignCategoryLink extends Base
public function doAction(array $data)
{
$values = array(
'id' => $data['task_id'],
'id' => $data['task_link']['task_id'],
'category_id' => $this->getParam('category_id'),
);
@@ -91,9 +93,8 @@ class TaskAssignCategoryLink extends Base
*/
public function hasRequiredCondition(array $data)
{
if ($data['link_id'] == $this->getParam('link_id')) {
$task = $this->taskFinderModel->getById($data['task_id']);
return empty($task['category_id']);
if ($data['task_link']['link_id'] == $this->getParam('link_id')) {
return empty($data['task']['category_id']);
}
return false;