mirror of
https://github.com/owncloud/bookmarks.git
synced 2025-03-21 12:29:14 +01:00
fetch bookmarks even if they are not tagged
This commit is contained in:
parent
39561f6460
commit
a515bf3c05
@ -56,18 +56,25 @@ if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){
|
||||
$_gc_separator = 'SEPARATOR \' \'';
|
||||
}
|
||||
|
||||
//FIXME: bookmarks without tags are not being retrieved
|
||||
$query = OC_DB::prepare('
|
||||
SELECT url, title, description, GROUP_CONCAT( tag '.$_gc_separator.' ) AS tags
|
||||
SELECT url, title, description,
|
||||
CASE WHEN *PREFIX*bookmarks.id = *PREFIX*bookmarks_tags.bookmark_id
|
||||
THEN GROUP_CONCAT( tag ' .$_gc_separator. ' )
|
||||
ELSE \' \'
|
||||
END
|
||||
AS tags
|
||||
FROM *PREFIX*bookmarks, *PREFIX*bookmarks_tags
|
||||
WHERE *PREFIX*bookmarks.id = *PREFIX*bookmarks_tags.bookmark_id
|
||||
WHERE (*PREFIX*bookmarks.id = *PREFIX*bookmarks_tags.bookmark_id
|
||||
OR *PREFIX*bookmarks.id NOT IN (
|
||||
SELECT *PREFIX*bookmarks_tags.bookmark_id FROM *PREFIX*bookmarks_tags
|
||||
)
|
||||
)
|
||||
AND *PREFIX*bookmarks.user_id = ?
|
||||
GROUP BY url
|
||||
'.$sqlFilterTag.'
|
||||
ORDER BY *PREFIX*bookmarks.id DESC
|
||||
LIMIT ?, 10');
|
||||
|
||||
|
||||
$bookmarks = $query->execute($params)->fetchAll();
|
||||
|
||||
echo json_encode( array( 'status' => 'success', 'data' => $bookmarks));
|
||||
|
Loading…
x
Reference in New Issue
Block a user