Add new event subtask.create_update

app/Core/Event/EventManager.php

@@ -3,6 +3,7 @@
 namespace Kanboard\Core\Event;
 
 use Kanboard\Model\TaskModel;
+use Kanboard\Model\SubtaskModel;
 use Kanboard\Model\TaskLinkModel;
 
 /**
@@ -54,6 +55,7 @@ class EventManager
             TaskModel::EVENT_ASSIGNEE_CHANGE   => t('Task assignee change'),
             TaskModel::EVENT_DAILY_CRONJOB     => t('Daily background job for tasks'),
             TaskModel::EVENT_MOVE_SWIMLANE     => t('Move a task to another swimlane'),
+            SubtaskModel::EVENT_CREATE_UPDATE  => t('Subtask creation or modification'),
         );
 
         $events = array_merge($events, $this->events);

app/Job/SubtaskEventJob.php

@@ -15,25 +15,25 @@ class SubtaskEventJob extends BaseJob
     /**
      * Set job params
      *
-     * @param  int     $subtaskId
+     * @param  int   $subtaskId
-     * @param  string  $eventName
+     * @param  array $eventNames
-     * @param  array   $values
+     * @param  array $values
      * @return $this
      */
-    public function withParams($subtaskId, $eventName, array $values = array())
+    public function withParams($subtaskId, array $eventNames, array $values = array())
     {
-        $this->jobParams = array($subtaskId, $eventName, $values);
+        $this->jobParams = array($subtaskId, $eventNames, $values);
         return $this;
     }
 
     /**
      * Execute job
      *
-     * @param  int    $subtaskId
+     * @param  int   $subtaskId
-     * @param  string $eventName
+     * @param  array $eventNames
-     * @param  array  $values
+     * @param  array $values
      */
-    public function execute($subtaskId, $eventName, array $values = array())
+    public function execute($subtaskId, array $eventNames, array $values = array())
     {
         $event = SubtaskEventBuilder::getInstance($this->container)
             ->withSubtaskId($subtaskId)
@@ -41,7 +41,9 @@ class SubtaskEventJob extends BaseJob
             ->buildEvent();
 
         if ($event !== null) {
-            $this->dispatcher->dispatch($eventName, $event);
+            foreach ($eventNames as $eventName) {
+                $this->dispatcher->dispatch($eventName, $event);
+            }
         }
     }
 }

app/Locale/bs_BA/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/ca_ES/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/cs_CZ/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/da_DK/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/de_DE/translations.php

@@ -1409,14 +1409,16 @@ return array(
     'XBT - bitcoin' => 'XBT - Bitcoin',
     'Assigned' => 'Zugeordnet',
     'Task limits apply to each swimlane individually' => 'Aufgabenlimit gilt pro Swimlane',
-    // 'Column task limits apply to each swimlane individually' => '',
+    'Column task limits apply to each swimlane individually' => 'Spaltenaufgabenlimit für jede Swimlane einzeln anwenden',
-    // 'Column task limits are applied to each swimlane individually' => '',
+    'Column task limits are applied to each swimlane individually' => 'Spaltenaufgabenlimit wird für jede Swimlane einzeln angewendet',
-    // 'Column task limits are applied across swimlanes' => '',
+    'Column task limits are applied across swimlanes' => 'Spaltenaufgabenlimit wird swimlaneübergreifend angewendet',
-    // 'Task limit: ' => '',
+    'Task limit: ' => 'Aufgabenlimit',
     'Change to global tag' => 'Zu globalem Schlagwort machen',
     'Do you really want to make the tag "%s" global?' => 'Das Schlagwort "%s" wirklich global machen?',
     'Enable global tags for this project' => 'Globale Schlagworte für dieses Projekt aktivieren',
     'Group membership(s):' => 'Gruppen-Mitgliedschaft(en):',
     '%s is a member of the following group(s): %s' => '%s ist Mitglied in der/den folgenden Gruppe(n): %s',
     // '%d/%d group(s) shown' => '',
+    'Group membership(s):' => 'Gruppen Mitgliedschaft(en)',
+    'Subtask creation or modification' => 'Teilaufgabe erstellen oder ändern',
 );

app/Locale/el_GR/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/es_ES/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/es_VE/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/fa_IR/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/fi_FI/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/fr_FR/translations.php

@@ -1419,4 +1419,5 @@ return array(
     'Group membership(s):' => 'Membre des groupes :',
     '%s is a member of the following group(s): %s' => '%s est membre des groupes suivants: %s',
     '%d/%d group(s) shown' => '%d/%d groupe(s) affiché(s)',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/hr_HR/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/hu_HU/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/id_ID/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/it_IT/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/ja_JP/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/ko_KR/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/my_MY/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/nb_NO/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/nl_NL/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/pl_PL/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/pt_BR/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/pt_PT/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/ro_RO/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/ru_RU/translations.php

@@ -1419,4 +1419,7 @@ return array(
     'Group membership(s):' => 'Состоит в группах:',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Enable global tags for this project' => '',
+    // 'Group membership(s):' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/sk_SK/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/sr_Latn_RS/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/sv_SE/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/th_TH/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/tr_TR/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/uk_UA/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/vi_VN/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/zh_CN/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Locale/zh_TW/translations.php

@@ -1419,4 +1419,5 @@ return array(
     // 'Group membership(s):' => '',
     // '%s is a member of the following group(s): %s' => '',
     // '%d/%d group(s) shown' => '',
+    // 'Subtask creation or modification' => '',
 );

app/Model/SubtaskModel.php

@@ -34,9 +34,10 @@ class SubtaskModel extends Base
      *
      * @var string
      */
-    const EVENT_UPDATE = 'subtask.update';
+    const EVENT_UPDATE        = 'subtask.update';
-    const EVENT_CREATE = 'subtask.create';
+    const EVENT_CREATE        = 'subtask.create';
-    const EVENT_DELETE = 'subtask.delete';
+    const EVENT_DELETE        = 'subtask.delete';
+    const EVENT_CREATE_UPDATE = 'subtask.create_update';
 
     /**
      * Get projectId from subtaskId
@@ -216,7 +217,10 @@ class SubtaskModel extends Base
 
         if ($subtaskId !== false) {
             $this->subtaskTimeTrackingModel->updateTaskTimeTracking($values['task_id']);
-            $this->queueManager->push($this->subtaskEventJob->withParams($subtaskId, self::EVENT_CREATE));
+            $this->queueManager->push($this->subtaskEventJob->withParams(
+                $subtaskId, 
+                array(self::EVENT_CREATE_UPDATE, self::EVENT_CREATE)
+            ));
         }
 
         return $subtaskId;
@@ -240,7 +244,11 @@ class SubtaskModel extends Base
             $this->subtaskTimeTrackingModel->updateTaskTimeTracking($subtask['task_id']);
 
             if ($fireEvent) {
-                $this->queueManager->push($this->subtaskEventJob->withParams($subtask['id'], self::EVENT_UPDATE, $values));
+                $this->queueManager->push($this->subtaskEventJob->withParams(
+                    $subtask['id'], 
+                    array(self::EVENT_CREATE_UPDATE, self::EVENT_UPDATE),
+                    $values
+                ));
             }
         }
 
@@ -256,7 +264,7 @@ class SubtaskModel extends Base
      */
     public function remove($subtaskId)
     {
-        $this->subtaskEventJob->execute($subtaskId, self::EVENT_DELETE);
+        $this->subtaskEventJob->execute($subtaskId, array(self::EVENT_DELETE));
         return $this->db->table(self::TABLE)->eq('id', $subtaskId)->remove();
     }
 

tests/units/Job/SubtaskEventJobTest.php

@@ -12,9 +12,9 @@ class SubtaskEventJobTest extends Base
     public function testJobParams()
     {
         $subtaskEventJob = new SubtaskEventJob($this->container);
-        $subtaskEventJob->withParams(123, 'foobar', array('k' => 'v'));
+        $subtaskEventJob->withParams(123, array('foobar'), array('k' => 'v'));
 
-        $this->assertSame(array(123, 'foobar', array('k' => 'v')), $subtaskEventJob->getJobParams());
+        $this->assertSame(array(123, array('foobar'), array('k' => 'v')), $subtaskEventJob->getJobParams());
     }
 
     public function testWithMissingSubtask()
@@ -22,7 +22,7 @@ class SubtaskEventJobTest extends Base
         $this->container['dispatcher']->addListener(SubtaskModel::EVENT_CREATE, function() {});
 
         $subtaskEventJob = new SubtaskEventJob($this->container);
-        $subtaskEventJob->execute(42, SubtaskModel::EVENT_CREATE);
+        $subtaskEventJob->execute(42, array(SubtaskModel::EVENT_CREATE));
 
         $called = $this->container['dispatcher']->getCalledListeners();
         $this->assertEmpty($called);
@@ -33,6 +33,7 @@ class SubtaskEventJobTest extends Base
         $this->container['dispatcher']->addListener(SubtaskModel::EVENT_CREATE, function() {});
         $this->container['dispatcher']->addListener(SubtaskModel::EVENT_UPDATE, function() {});
         $this->container['dispatcher']->addListener(SubtaskModel::EVENT_DELETE, function() {});
+        $this->container['dispatcher']->addListener(SubtaskModel::EVENT_CREATE_UPDATE, function() {});
 
         $subtaskModel = new SubtaskModel($this->container);
         $taskCreationModel = new TaskCreationModel($this->container);
@@ -48,5 +49,6 @@ class SubtaskEventJobTest extends Base
         $this->assertArrayHasKey(SubtaskModel::EVENT_CREATE.'.closure', $called);
         $this->assertArrayHasKey(SubtaskModel::EVENT_UPDATE.'.closure', $called);
         $this->assertArrayHasKey(SubtaskModel::EVENT_DELETE.'.closure', $called);
+        $this->assertArrayHasKey(SubtaskModel::EVENT_CREATE_UPDATE.'.closure', $called);
     }
 }