fix(HR Streams) filter StreamModalities end field from json input

Change-Id: Icc8795d56593bf92d1a254d0aaa7f9bdb413929f Reviewed-on: http://gerrit.tine20.com/customers/18545 Tested-by: Jenkins CI (http://ci.tine20.com/) <tine20-jenkins@metaways.de> Reviewed-by: Paul Mehrer <p.mehrer@metaways.de>
tine20 · Nov 24, 2020 · 65a148a · 65a148a
1 parent 83bd916
commit 65a148a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/tests/tine20/HumanResources/Json/StreamTests.php b/tests/tine20/HumanResources/Json/StreamTests.php
@@ -40,6 +40,8 @@ public function testVirtualProperties()
             Stream::FLD_STREAM_MODALITIES => [
                 [
                     StreamModality::FLD_START => Tinebase_DateTime::now()->toString('Y-m-d'),
+                    // set end date to test filtering
+                    StreamModality::FLD_END => Tinebase_DateTime::now()->addWeek(10)->toString('Y-m-d'),
                     StreamModality::FLD_INTERVAL => StreamModality::INT_WEEKLY,
                     StreamModality::FLD_NUM_INTERVAL => 10,
                     StreamModality::FLD_HOURS_INTERVAL => 16,

diff --git a/tine20/HumanResources/Model/Stream.php b/tine20/HumanResources/Model/Stream.php
@@ -158,4 +158,20 @@ class HumanResources_Model_Stream extends Tinebase_Record_NewAbstract
             ]
         ],
     ];
+
+    /**
+     * can be reimplemented by subclasses to modify values during setFromJson
+     * @param array $_data the json decoded values
+     * @return void
+     */
+    protected function _setFromJson(array &$_data)
+    {
+        if (isset($_data[self::FLD_STREAM_MODALITIES]) && is_array($_data[self::FLD_STREAM_MODALITIES])) {
+            foreach ($_data[self::FLD_STREAM_MODALITIES] as &$streamModality) {
+                if (isset($streamModality[HumanResources_Model_StreamModality::FLD_END])) {
+                    unset($streamModality[HumanResources_Model_StreamModality::FLD_END]);
+                }
+            }
+        }
+    }
 }