From 650464d474a9401b036220ed2119abefcd131474 Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Sun, 15 Oct 2017 16:42:41 -0500 Subject: [PATCH] Dont include archived in tag note count --- app/assets/javascripts/app/frontend/controllers/tags.js | 4 +++- app/assets/templates/frontend/editor.html.haml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/frontend/controllers/tags.js b/app/assets/javascripts/app/frontend/controllers/tags.js index 41e34cc14..abad7e59f 100644 --- a/app/assets/javascripts/app/frontend/controllers/tags.js +++ b/app/assets/javascripts/app/frontend/controllers/tags.js @@ -143,7 +143,9 @@ angular.module('app.frontend') } this.noteCount = function(tag) { - var validNotes = Note.filterDummyNotes(tag.notes); + var validNotes = Note.filterDummyNotes(tag.notes).filter(function(note){ + return !note.archived; + }); return validNotes.length; } diff --git a/app/assets/templates/frontend/editor.html.haml b/app/assets/templates/frontend/editor.html.haml index 89579d0dd..56065ced9 100644 --- a/app/assets/templates/frontend/editor.html.haml +++ b/app/assets/templates/frontend/editor.html.haml @@ -24,7 +24,7 @@ %li %label{"ng-click" => "ctrl.selectedMenuItem($event); ctrl.toggleArchiveNote()"} %i.icon.ion-ios-box - {{ctrl.note.archived ? "Unarcnive" : "Archive"}} + {{ctrl.note.archived ? "Unarchive" : "Archive"}} %li %label{"ng-click" => "ctrl.selectedMenuItem($event); ctrl.deleteNote()"} %i.icon.ion-trash-b