summaryrefslogtreecommitdiff
path: root/app/Model/TaskFinder.php
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2015-05-10 13:45:09 -0400
committerFrederic Guillot <fred@kanboard.net>2015-05-10 13:45:09 -0400
commit94a5b12e68fc5e5f6aee7bf1d6d25427421aba7a (patch)
treeaa1f86e9fd134ec60534446948dcd2d54e02e5f7 /app/Model/TaskFinder.php
parent98aab0d99465b40907bbc1f1108ea20db290e036 (diff)
parentec24efa2d9599eaf6cbc39da25cffeaff555ba3c (diff)
Merge pull-request #847 (recurring tasks)
Diffstat (limited to 'app/Model/TaskFinder.php')
-rw-r--r--app/Model/TaskFinder.php14
1 files changed, 14 insertions, 0 deletions
diff --git a/app/Model/TaskFinder.php b/app/Model/TaskFinder.php
index 54dd578a..6f53249a 100644
--- a/app/Model/TaskFinder.php
+++ b/app/Model/TaskFinder.php
@@ -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,