rooty/OwncloudBookmarksOfficial
1
0
Fork 0
mirror of https://github.com/owncloud/bookmarks.git synced 2025-02-02 02:52:10 +01:00
Code Issues Releases Activity

Merge pull request #108 from owncloud/FixEmptyFilter

Browse Source 
Fix public query with empty filter
This commit is contained in:
ganomi 2014-12-26 20:31:49 +01:00
commit 69a0118e49
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controller/lib/bookmarks.php
View File

@ -160,7 +160,9 @@ class Bookmarks {
$sql .= ' AND public = 1 ';
}
Bookmarks::findBookmarksBuildFilter($sql, $params, $filters, $filterTagOnly, $tagFilterConjunction, $CONFIG_DBTYPE);
if (count($filters) > 0) {
Bookmarks::findBookmarksBuildFilter($sql, $params, $filters, $filterTagOnly, $tagFilterConjunction, $CONFIG_DBTYPE);
}
if (!in_array($sqlSortColumn, $tableAttributes)) {
$sqlSortColumn = 'lastmodified';

24
tests/publiccontroller_test.php
View File

@ -3,6 +3,7 @@
OC_App::loadApp('bookmarks');
use \OCA\Bookmarks\Controller\Rest\PublicController;
use OCA\Bookmarks\Controller\Lib\Bookmarks;
class Test_PublicController_Bookmarks extends PHPUnit_Framework_TestCase {
@ -24,14 +25,33 @@ class Test_PublicController_Bookmarks extends PHPUnit_Framework_TestCase {
$output = $this->publicController->returnAsJson(null, "apassword", null);
$data = $output->getData();
$status = $data['status'];
$this->assertEquals($status, 'error');
$this->assertEquals($status, 'error');
}
function testPublicQueryWrongUser() {
$output = $this->publicController->returnAsJson("cqc43dr4rx3x4xatr4", "apassword", null);
$data = $output->getData();
$status = $data['status'];
$this->assertEquals($status, 'error');
$this->assertEquals($status, 'error');
}
function testPublicQuery() {
Bookmarks::addBookmark($this->userid, $this->db, "http://www.golem.de", "Golem", array("four"), "PublicNoTag", true);
Bookmarks::addBookmark($this->userid, $this->db, "http://www.9gag.com", "9gag", array("two", "three"), "PublicTag", true);
$output = $this->publicController->returnAsJson($this->userid);
$data = $output->getData();
$this->assertEquals(2, count($data));
$this->cleanDB();
}
function cleanDB() {
$query1 = OC_DB::prepare('DELETE FROM *PREFIX*bookmarks');
$query1->execute();
$query2 = OC_DB::prepare('DELETE FROM *PREFIX*bookmarks_tags');
$query2->execute();
}
}