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

Merge pull-request #847 (recurring tasks)

Browse Source
This commit is contained in:
Frederic Guillot
2015-05-10 13:45:09 -04:00
parent 98aab0d994 ec24efa2d9
commit 94a5b12e68
40 changed files with 1134 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Model/TaskFinder.php
View File

@@ -104,6 +104,13 @@ class TaskFinder extends Base
'tasks.score',
'tasks.category_id',
'tasks.date_moved',
'tasks.recurrence_status',
'tasks.recurrence_trigger',
'tasks.recurrence_factor',
'tasks.recurrence_timeframe',
'tasks.recurrence_basedate',
'tasks.recurrence_parent',
'tasks.recurrence_child',
'users.username AS assignee_username',
'users.name AS assignee_name'
)
@@ -246,6 +253,13 @@ class TaskFinder extends Base
tasks.category_id,
tasks.swimlane_id,
tasks.date_moved,
tasks.recurrence_status,
tasks.recurrence_trigger,
tasks.recurrence_factor,
tasks.recurrence_timeframe,
tasks.recurrence_basedate,
tasks.recurrence_parent,
tasks.recurrence_child,
project_has_categories.name AS category_name,
projects.name AS project_name,
columns.title AS column_title,