diff options
author | Frederic Guillot <fred@kanboard.net> | 2016-01-17 14:56:31 -0500 |
---|---|---|
committer | Frederic Guillot <fred@kanboard.net> | 2016-01-17 14:56:31 -0500 |
commit | e94c4cab7f79657f8b514b4af6c4e459e9b42961 (patch) | |
tree | 4986bdff7f1b1b401ff819642a1bab8d1d1c9a39 /app/Action | |
parent | 1259e911e4316f9f1ae401f4f293da69d9ba9e78 (diff) |
Avoid automatic actions that change the color to fire subsequent events
Diffstat (limited to 'app/Action')
-rw-r--r-- | app/Action/Base.php | 19 | ||||
-rw-r--r-- | app/Action/TaskAssignColorCategory.php | 2 | ||||
-rw-r--r-- | app/Action/TaskAssignColorColumn.php | 2 | ||||
-rw-r--r-- | app/Action/TaskAssignColorLink.php | 2 | ||||
-rw-r--r-- | app/Action/TaskAssignColorUser.php | 2 |
5 files changed, 17 insertions, 10 deletions
diff --git a/app/Action/Base.php b/app/Action/Base.php index 1298aec2..efc52f04 100644 --- a/app/Action/Base.php +++ b/app/Action/Base.php @@ -119,7 +119,13 @@ abstract class Base extends \Kanboard\Core\Base */ public function __toString() { - return $this->getName(); + $params = array(); + + foreach ($this->params as $key => $value) { + $params[] = $key.'='.var_export($value, true); + } + + return $this->getName().'('.implode('|', $params).'])'; } /** @@ -246,16 +252,17 @@ abstract class Base extends \Kanboard\Core\Base } $data = $event->getAll(); - $result = false; + $executable = $this->isExecutable($data, $eventName); + $executed = false; - if ($this->isExecutable($data, $eventName)) { + if ($executable) { $this->called = true; - $result = $this->doAction($data); + $executed = $this->doAction($data); } - $this->logger->debug('AutomaticAction '.$this->getName().' => '.($result ? 'true' : 'false')); + $this->logger->debug($this.' ['.$eventName.'] => executable='.var_export($executable, true).' exec_success='.var_export($executed, true)); - return $result; + return $executed; } /** diff --git a/app/Action/TaskAssignColorCategory.php b/app/Action/TaskAssignColorCategory.php index 3a15b15f..139c24cb 100644 --- a/app/Action/TaskAssignColorCategory.php +++ b/app/Action/TaskAssignColorCategory.php @@ -78,7 +78,7 @@ class TaskAssignColorCategory extends Base 'color_id' => $this->getParam('color_id'), ); - return $this->taskModification->update($values); + return $this->taskModification->update($values, false); } /** diff --git a/app/Action/TaskAssignColorColumn.php b/app/Action/TaskAssignColorColumn.php index 7474045b..92412739 100644 --- a/app/Action/TaskAssignColorColumn.php +++ b/app/Action/TaskAssignColorColumn.php @@ -79,7 +79,7 @@ class TaskAssignColorColumn extends Base 'color_id' => $this->getParam('color_id'), ); - return $this->taskModification->update($values); + return $this->taskModification->update($values, false); } /** diff --git a/app/Action/TaskAssignColorLink.php b/app/Action/TaskAssignColorLink.php index f71df70e..12ceabb3 100644 --- a/app/Action/TaskAssignColorLink.php +++ b/app/Action/TaskAssignColorLink.php @@ -78,7 +78,7 @@ class TaskAssignColorLink extends Base 'color_id' => $this->getParam('color_id'), ); - return $this->taskModification->update($values); + return $this->taskModification->update($values, false); } /** diff --git a/app/Action/TaskAssignColorUser.php b/app/Action/TaskAssignColorUser.php index 6e56bdc5..6ec8ce95 100644 --- a/app/Action/TaskAssignColorUser.php +++ b/app/Action/TaskAssignColorUser.php @@ -79,7 +79,7 @@ class TaskAssignColorUser extends Base 'color_id' => $this->getParam('color_id'), ); - return $this->taskModification->update($values); + return $this->taskModification->update($values, false); } /** |