allow listing all and untagged notes

diff --git a/controller/guicontroller.php b/controller/guicontroller.php
index b07ba45679051911653d9845fe9ce28b1de4161d..1a4d0233cdeb002726b3c391037a29c3585bda7f 100644 (file)
--- a/controller/guicontroller.php
+++ b/controller/guicontroller.php
@@ -83,7 +83,7 @@ class GuiController extends Controller
         $res = new TemplateResponse('grauphel', 'tag');
         $res->setParams(
             array(
-                'tag'    => substr($rawtag, 16),
+                'tag'    => $this->getPrettyTagName($rawtag),
                 'rawtag' => $rawtag,
                 'notes'  => $notes,
             )
@@ -108,11 +108,17 @@ class GuiController extends Controller
 
         $rawtags = $this->getNotes()->getTags();
         sort($rawtags);
+        array_unshift(
+            $rawtags,
+            'grauphel:special:all', 'grauphel:special:untagged'
+        );
+
         $tags = array();
         foreach ($rawtags as $rawtag) {
-            if (substr($rawtag, 0, 16) == 'system:notebook:') {
+            $name = $this->getPrettyTagName($rawtag);
+            if ($name !== false) {
                 $tags[] = array(
-                    'name' => substr($rawtag, 16),
+                    'name' => $name,
                     'id'   => $rawtag,
                     'href' => $this->urlGen->linkToRoute(
                         'grauphel.gui.tag', array('rawtag' => $rawtag)
@@ -168,5 +174,15 @@ class GuiController extends Controller
         $notes->setUsername($username);
         return $notes;
     }
+
+    protected function getPrettyTagName($rawtag)
+    {
+        if (substr($rawtag, 0, 16) == 'system:notebook:') {
+            return substr($rawtag, 16);
+        } else if (substr($rawtag, 0, 17) == 'grauphel:special:') {
+            return '*' . substr($rawtag, 17) . '*';
+        }
+        return false;
+    }
 }
 ?>

diff --git a/lib/notestorage.php b/lib/notestorage.php
index 3b517634a5e9e7306febf15bae09c0466c994ead..bca7dfd5d1cea3cc4d63da932c945ad1257701f0 100644 (file)
--- a/lib/notestorage.php
+++ b/lib/notestorage.php
@@ -285,7 +285,9 @@ class NoteStorage
      * Optionally only those changed after $since revision
      *
      * @param integer $since  Revision number after which the notes changed
-     * @param string  $rawtag Filter by tags
+     * @param string  $rawtag Filter by tag. Special tags:
+     *                        - grauphel:special:all
+     *                        - grauphel:special:untagged
      *
      * @return array Array of short note objects
      */
@@ -299,7 +301,13 @@ class NoteStorage
         );
 
         $notes = array();
-        $jsRawtag = json_encode($rawtag);
+        if ($rawtag == 'grauphel:special:all') {
+            $rawtag = null;
+        } else if ($rawtag == 'grauphel:special:untagged') {
+            $jsRawtag = json_encode(array());
+        } else {
+            $jsRawtag = json_encode($rawtag);
+        }
         while ($row = $result->fetchRow()) {
             if ($since !== null && $row['note_last_sync_revision'] <= $since) {
                 continue;