diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2011-08-23 15:12:34 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2011-08-23 15:12:34 +0200 |
| commit | 89839b4c634f6b8b2949376d0fa8520d1dd64589 (patch) | |
| tree | 5b733dc8b1d41958039f365ef5336b7eccb7244c /apps/bookmarks/ajax | |
| parent | 7e1759e775438e95e5e5eb0aa3059e1f5f99d6f6 (diff) | |
| download | nextcloud-server-89839b4c634f6b8b2949376d0fa8520d1dd64589.tar.gz nextcloud-server-89839b4c634f6b8b2949376d0fa8520d1dd64589.zip | |
fetch bookmarks even if they are not tagged
Diffstat (limited to 'apps/bookmarks/ajax')
| -rw-r--r-- | apps/bookmarks/ajax/updateList.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/apps/bookmarks/ajax/updateList.php b/apps/bookmarks/ajax/updateList.php index 9a53b45542c..9290757d0b1 100644 --- a/apps/bookmarks/ajax/updateList.php +++ b/apps/bookmarks/ajax/updateList.php @@ -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)); |