mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3010 from nextcloud/backport-3009-fix-calendar-todo-event-type 

[stable11] Make sure the used event type and the setting/filter are the same
This commit is contained in:
Joas Schilling 2017-01-10 16:49:23 +01:00 committed by GitHub
parent 0474abe5c7 73e93d11c2
commit fb4224c723
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/lib/CalDAV/Activity/Filter/Todo.php
View File

@ -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
View File

@ -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
View File

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