Make sure the used event type and the setting/filter are the same

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/apps/dav/lib/CalDAV/Activity/Filter/Todo.php b/apps/dav/lib/CalDAV/Activity/Filter/Todo.php
index 312bb6c472d84de23b51eeabab579fa93b5c71ef..42ee07408513ccbfe7640e7250fa097a136e67e2 100644 (file)
--- a/apps/dav/lib/CalDAV/Activity/Filter/Todo.php
+++ b/apps/dav/lib/CalDAV/Activity/Filter/Todo.php
@@ -79,7 +79,7 @@ class Todo implements IFilter {
         * @since 11.0.0
         */
        public function filterTypes(array $types) {
-               return array_intersect(['calendar_todos'], $types);
+               return array_intersect(['calendar_todo'], $types);
        }
 
        /**

diff --git a/apps/dav/lib/CalDAV/Activity/Setting/Todo.php b/apps/dav/lib/CalDAV/Activity/Setting/Todo.php
index 0c8215f4843de1269b46a4e0fb922bce883814ed..234774bfea4aca49b0fad639e7989c55345aeb66 100644 (file)
--- a/apps/dav/lib/CalDAV/Activity/Setting/Todo.php
+++ b/apps/dav/lib/CalDAV/Activity/Setting/Todo.php
@@ -42,7 +42,7 @@ class Todo implements ISetting {
         * @since 11.0.0
         */
        public function getIdentifier() {
-               return 'calendar_todos';
+               return 'calendar_todo';
        }
 
        /**

diff --git a/apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php b/apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php
index 3c6ac2a5c5513510ea02971360da9765e1b5737c..54a5a6f5f9d6c04173439ad9afe471644dd14f61 100644 (file)
--- a/apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php
+++ b/apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php
@@ -67,9 +67,9 @@ class TodoTest extends TestCase {
        public function dataFilterTypes() {
                return [
                        [[], []],
-                       [['calendar_todos'], ['calendar_todos']],
-                       [['calendar', 'calendar_event', 'calendar_todos'], ['calendar_todos']],
-                       [['calendar', 'calendar_todos', 'files'], ['calendar_todos']],
+                       [['calendar_todo'], ['calendar_todo']],
+                       [['calendar', 'calendar_event', 'calendar_todo'], ['calendar_todo']],
+                       [['calendar', 'calendar_todo', 'files'], ['calendar_todo']],
                ];
        }