Browse Source

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

Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/3009/head
Joas Schilling 9 years ago
parent
commit
a70a081fff
No known key found for this signature in database GPG Key ID: E166FD8976B3BAC8
  1. 2
      apps/dav/lib/CalDAV/Activity/Filter/Todo.php
  2. 2
      apps/dav/lib/CalDAV/Activity/Setting/Todo.php
  3. 6
      apps/dav/tests/unit/CalDAV/Activity/Filter/TodoTest.php

2
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);
}
/**

2
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';
}
/**

6
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']],
];
}

Loading…
Cancel
Save