From 58a0db28cccd6096a129620ddd0e631c1732fc9e Mon Sep 17 00:00:00 2001
From: David-Norris <Dave@Rachels-MacBook-Pro.local>
Date: Tue, 5 May 2015 23:40:05 -0400
Subject: 2nd Recurring Tasks Commit

New Trigger (move from first column)
New method to get last column of a board
Locales updated
API changes (createTask, updateTask)
API Docs & Examples
---
 app/Model/TaskPosition.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'app/Model/TaskPosition.php')

diff --git a/app/Model/TaskPosition.php b/app/Model/TaskPosition.php
index 8589cac5..37c1ace0 100644
--- a/app/Model/TaskPosition.php
+++ b/app/Model/TaskPosition.php
@@ -40,10 +40,15 @@ class TaskPosition extends Base
                 $this->fireEvents($original_task, $column_id, $position, $swimlane_id);
             }
 
-            if ($original_task['column_id'] != $column_id
-                && $column_id == $this->board->getLastColumnPosition($project_id)
-                && $original_task['recurrence_status'] == Task::RECURE_STATUS_PENDING
-                && $original_task['recurrence_trigger'] == Task::RECURE_TRIGGER_MOVE)
+            if ($original_task['recurrence_status'] == Task::RECURE_STATUS_PENDING
+                && $original_task['column_id'] != $column_id
+                && (
+                ($original_task['column_id'] == $this->board->getFirstColumn($project_id)
+                    && $original_task['recurrence_trigger'] == Task::RECURE_TRIGGER_FIRST)
+                || ($column_id == $this->board->getLastColumn($project_id)
+                    && $original_task['recurrence_trigger'] == Task::RECURE_TRIGGER_LAST)
+                )
+            )
             {
                 $this->taskDuplication->createRecurrence($task_id);
             }
-- 
cgit v1.2.3