Avoid automatic actions that change the color to fire subsequent events

4 files changed, 16 insertions, 10 deletions

diff --git a/app/Model/TaskCreation.php b/app/Model/TaskCreation.php
index 88912d4d..975cc7a3 100644
--- a/app/Model/TaskCreation.php
+++ b/app/Model/TaskCreation.php
@@ -88,6 +88,9 @@ class TaskCreation extends Base
     {
         $event = new TaskEvent(array('task_id' => $task_id) + $values);
 
+        $this->logger->debug('Event fired: '.Task::EVENT_CREATE_UPDATE);
+        $this->logger->debug('Event fired: '.Task::EVENT_CREATE);
+
         $this->dispatcher->dispatch(Task::EVENT_CREATE_UPDATE, $event);
         $this->dispatcher->dispatch(Task::EVENT_CREATE, $event);
 
diff --git a/app/Model/TaskModification.php b/app/Model/TaskModification.php
index 781646b8..5f0fd074 100644
--- a/app/Model/TaskModification.php
+++ b/app/Model/TaskModification.php
@@ -17,16 +17,17 @@ class TaskModification extends Base
      *
      * @access public
      * @param  array     $values
+     * @param  boolean   $fire_events
      * @return boolean
      */
-    public function update(array $values)
+    public function update(array $values, $fire_events = true)
     {
         $original_task = $this->taskFinder->getById($values['id']);
 
         $this->prepare($values);
         $result = $this->db->table(Task::TABLE)->eq('id', $original_task['id'])->update($values);
 
-        if ($result) {
+        if ($fire_events && $result) {
             $this->fireEvents($original_task, $values);
         }
 
@@ -57,7 +58,8 @@ class TaskModification extends Base
         }
 
         foreach ($events as $event) {
-            $this->container['dispatcher']->dispatch($event, new TaskEvent($event_data));
+            $this->logger->debug('Event fired: '.$event);
+            $this->dispatcher->dispatch($event, new TaskEvent($event_data));
         }
     }
 
diff --git a/app/Model/TaskPosition.php b/app/Model/TaskPosition.php
index 762f7fe3..091d908d 100644
--- a/app/Model/TaskPosition.php
+++ b/app/Model/TaskPosition.php
@@ -177,11 +177,14 @@ class TaskPosition extends Base
         );
 
         if ($task['swimlane_id'] != $new_swimlane_id) {
-            $this->container['dispatcher']->dispatch(Task::EVENT_MOVE_SWIMLANE, new TaskEvent($event_data));
+            $this->logger->debug('Event fired: '.Task::EVENT_MOVE_SWIMLANE);
+            $this->dispatcher->dispatch(Task::EVENT_MOVE_SWIMLANE, new TaskEvent($event_data));
         } elseif ($task['column_id'] != $new_column_id) {
-            $this->container['dispatcher']->dispatch(Task::EVENT_MOVE_COLUMN, new TaskEvent($event_data));
+            $this->logger->debug('Event fired: '.Task::EVENT_MOVE_COLUMN);
+            $this->dispatcher->dispatch(Task::EVENT_MOVE_COLUMN, new TaskEvent($event_data));
         } elseif ($task['position'] != $new_position) {
-            $this->container['dispatcher']->dispatch(Task::EVENT_MOVE_POSITION, new TaskEvent($event_data));
+            $this->logger->debug('Event fired: '.Task::EVENT_MOVE_POSITION);
+            $this->dispatcher->dispatch(Task::EVENT_MOVE_POSITION, new TaskEvent($event_data));
         }
     }
 }
diff --git a/app/Model/TaskStatus.php b/app/Model/TaskStatus.php
index afb5ffb5..2b902815 100644
--- a/app/Model/TaskStatus.php
+++ b/app/Model/TaskStatus.php
@@ -113,10 +113,8 @@ class TaskStatus extends Base
                         ));
 
         if ($result) {
-            $this->container['dispatcher']->dispatch(
-                $event,
-                new TaskEvent(array('task_id' => $task_id) + $this->taskFinder->getById($task_id))
-            );
+            $this->logger->debug('Event fired: '.$event);
+            $this->dispatcher->dispatch($event, new TaskEvent(array('task_id' => $task_id) + $this->taskFinder->getById($task_id)));
         }
 
         return $result;