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

Merge pull request #2816 from nextcloud/changing_how_favorites_are_serialized 

Return explicit values instead of boolean from sabre (#26654)
This commit is contained in:
Roeland Jago Douma 2016-12-23 14:36:05 +01:00 committed by GitHub
parent c5cc0d87a8 928f113361
commit 886341aca4
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/dav/lib/Connector/Sabre/TagsPlugin.php
View File

@ -250,7 +250,11 @@ class TagsPlugin extends \Sabre\DAV\ServerPlugin
if (is_null($isFav)) { if (is_null($isFav)) {
list(, $isFav) = $this->getTagsAndFav($node->getId()); list(, $isFav) = $this->getTagsAndFav($node->getId());
} }
return $isFav; if ($isFav) {
return 1;
} else {
return 0;
}
}); });
} }

8
build/integration/features/favorites.feature
View File

@ -19,7 +19,7 @@ Feature: favorite
And user "user0" unfavorites element "/FOLDER" And user "user0" unfavorites element "/FOLDER"
Then as "user0" gets properties of folder "/FOLDER" with Then as "user0" gets properties of folder "/FOLDER" with
|{http://owncloud.org/ns}favorite| |{http://owncloud.org/ns}favorite|
And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "" And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "0"
Scenario: Favorite a file Scenario: Favorite a file
Given using old dav path Given using old dav path
@ -38,7 +38,7 @@ Feature: favorite
And user "user0" unfavorites element "/textfile0.txt" And user "user0" unfavorites element "/textfile0.txt"
Then as "user0" gets properties of file "/textfile0.txt" with Then as "user0" gets properties of file "/textfile0.txt" with
|{http://owncloud.org/ns}favorite| |{http://owncloud.org/ns}favorite|
And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "" And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "0"
Scenario: Favorite a folder new endpoint Scenario: Favorite a folder new endpoint
Given using new dav path Given using new dav path
@ -57,7 +57,7 @@ Feature: favorite
And user "user0" unfavorites element "/FOLDER" And user "user0" unfavorites element "/FOLDER"
Then as "user0" gets properties of folder "/FOLDER" with Then as "user0" gets properties of folder "/FOLDER" with
|{http://owncloud.org/ns}favorite| |{http://owncloud.org/ns}favorite|
And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "" And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "0"
Scenario: Favorite a file new endpoint Scenario: Favorite a file new endpoint
Given using new dav path Given using new dav path
@ -76,7 +76,7 @@ Feature: favorite
And user "user0" unfavorites element "/textfile0.txt" And user "user0" unfavorites element "/textfile0.txt"
Then as "user0" gets properties of file "/textfile0.txt" with Then as "user0" gets properties of file "/textfile0.txt" with
|{http://owncloud.org/ns}favorite| |{http://owncloud.org/ns}favorite|
And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "" And the single response should contain a property "{http://owncloud.org/ns}favorite" with value "0"
Scenario: Get favorited elements of a folder Scenario: Get favorited elements of a folder
Given using old dav path Given using old dav path