rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes issue where notes do not display error decrypting if they are errored

Browse Source
This commit is contained in:
Mo Bitar
2019-04-02 09:50:30 -05:00
parent 301514c9a4
commit b8e5b308ea
4 changed files with 3698 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/app/controllers/notes.js
View File

@@ -91,6 +91,15 @@ angular.module('app')
this.reloadNotes = function() { this.reloadNotes = function() {
let notes = this.tag.notes; let notes = this.tag.notes;
// Typically we reload flags via modelManager.addItemSyncObserver,
// but sync observers are not notified of errored items, so we'll do it here instead
for(let note of notes) {
if(note.errorDecrypting) {
this.loadFlagsForNote(note);
}
}
this.setNotes(notes); this.setNotes(notes);
} }

4
app/assets/templates/tags.html.haml
View File

@@ -30,8 +30,8 @@
"ng-change" => "ctrl.tagTitleDidChange(tag)", "ng-blur" => "ctrl.saveTag($event, tag)", "spellcheck" => "false"} "ng-change" => "ctrl.tagTitleDidChange(tag)", "ng-blur" => "ctrl.saveTag($event, tag)", "spellcheck" => "false"}
.count {{tag.cachedNoteCount}} .count {{tag.cachedNoteCount}}
.red.small-text.bold{"ng-show" => "tag.content.conflict_of"} Conflicted copy .red.small-text.bold{"ng-show" => "tag.content.conflict_of"} Conflicted Copy
.red.small-text.bold{"ng-show" => "tag.errorDecrypting"} Unable to Decrypt .red.small-text.bold{"ng-show" => "tag.errorDecrypting"} Missing Keys
.menu{"ng-show" => "ctrl.selectedTag == tag"} .menu{"ng-show" => "ctrl.selectedTag == tag"}
%a.item{"ng-click" => "ctrl.selectedRenameTag($event, tag)", "ng-show" => "!ctrl.editingTag"} Rename %a.item{"ng-click" => "ctrl.selectedRenameTag($event, tag)", "ng-show" => "!ctrl.editingTag"} Rename

3690
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@@ -38,7 +38,7 @@
"serve-static": "^1.13.2", "serve-static": "^1.13.2",
"sn-models": "0.1.14", "sn-models": "0.1.14",
"sn-stylekit": "2.0.13", "sn-stylekit": "2.0.13",
"standard-file-js": "0.3.54", "standard-file-js": "file:~/Desktop/sn/dev/sfjs",
"grunt-shell": "^2.1.0" "grunt-shell": "^2.1.0"
} }
} }