Refactoring of internal task events

1 files changed, 9 insertions, 4 deletions

diff --git a/app/Action/Base.php b/app/Action/Base.php
index e5c65a17..e0ed8bde 100644
--- a/app/Action/Base.php
+++ b/app/Action/Base.php
@@ -216,7 +216,8 @@ abstract class Base extends \Kanboard\Core\Base
      */
     public function hasRequiredProject(array $data)
     {
-        return isset($data['project_id']) && $data['project_id'] == $this->getProjectId();
+        return (isset($data['project_id']) && $data['project_id'] == $this->getProjectId()) ||
+            (isset($data['task']['project_id']) && $data['task']['project_id'] == $this->getProjectId());
     }
 
     /**
@@ -226,10 +227,14 @@ abstract class Base extends \Kanboard\Core\Base
      * @param  array   $data   Event data dictionary
      * @return bool            True if all keys are there
      */
-    public function hasRequiredParameters(array $data)
+    public function hasRequiredParameters(array $data, array $parameters = array())
     {
-        foreach ($this->getEventRequiredParameters() as $parameter) {
-            if (! isset($data[$parameter])) {
+        $parameters = $parameters ?: $this->getEventRequiredParameters();
+
+        foreach ($parameters as $key => $value) {
+            if (is_array($value)) {
+                return isset($data[$key]) && $this->hasRequiredParameters($data[$key], $value);
+            } else if (! isset($data[$value])) {
                 return false;
             }
         }