From 35e58ea1056480418d36b08a98f288d583805b23 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 28 Oct 2014 07:52:48 +0100 Subject: [PATCH] show last note modification date --- controller/guicontroller.php | 2 +- lib/notestorage.php | 21 ++++++++++++++------- templates/tag.php | 1 + 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/controller/guicontroller.php b/controller/guicontroller.php index d186207..6fffcb2 100644 --- a/controller/guicontroller.php +++ b/controller/guicontroller.php @@ -149,7 +149,7 @@ class GuiController extends Controller */ public function tag($rawtag) { - $notes = $this->getNotes()->loadNotesOverview(null, $rawtag); + $notes = $this->getNotes()->loadNotesOverview(null, $rawtag, true); usort( $notes, function($noteA, $noteB) { diff --git a/lib/notestorage.php b/lib/notestorage.php index 6802e2f..621d120 100644 --- a/lib/notestorage.php +++ b/lib/notestorage.php @@ -386,17 +386,20 @@ class NoteStorage * Load notes for the given user in short form. * Optionally only those changed after $since revision * - * @param integer $since Revision number after which the notes changed - * @param string $rawtag Filter by tag. Special tags: - * - grauphel:special:all - * - grauphel:special:untagged + * @param integer $since Revision number after which the notes changed + * @param string $rawtag Filter by tag. Special tags: + * - grauphel:special:all + * - grauphel:special:untagged + * @param boolean $includeDate Load the last modification date or not * * @return array Array of short note objects */ - public function loadNotesOverview($since = null, $rawtag = null) - { + public function loadNotesOverview( + $since = null, $rawtag = null, $includeDate = false + ) { $result = \OC_DB::executeAudited( 'SELECT `note_guid`, `note_title`, `note_last_sync_revision`, `note_tags`' + . ', `note_last_change_date`' . ' FROM `*PREFIX*grauphel_notes`' . ' WHERE note_user = ?', array($this->username) @@ -417,7 +420,7 @@ class NoteStorage if ($rawtag !== null && strpos($row['note_tags'], $jsRawtag) === false) { continue; } - $notes[] = array( + $note = array( 'guid' => $row['note_guid'], 'ref' => array( 'api-ref' => $this->urlGen->getAbsoluteURL( @@ -433,6 +436,10 @@ class NoteStorage ), 'title' => $row['note_title'], ); + if ($includeDate) { + $note['last-change-date'] = $row['note_last_change_date']; + } + $notes[] = $note; } return $notes; diff --git a/templates/tag.php b/templates/tag.php index 850b034..b2cab02 100644 --- a/templates/tag.php +++ b/templates/tag.php @@ -21,6 +21,7 @@ + -- 2.30.2