From 86fd93ab0e0f3fa36b3305185c85f0933b13e3e2 Mon Sep 17 00:00:00 2001 From: Antonella Sgarlatta Date: Mon, 12 Jul 2021 19:30:57 -0300 Subject: [PATCH] fix: prevent restoring version if note is locked --- .../javascripts/directives/views/revisionPreviewModal.ts | 5 +++++ app/assets/javascripts/strings.ts | 2 ++ 2 files changed, 7 insertions(+) diff --git a/app/assets/javascripts/directives/views/revisionPreviewModal.ts b/app/assets/javascripts/directives/views/revisionPreviewModal.ts index 3332fbada..36768d61d 100644 --- a/app/assets/javascripts/directives/views/revisionPreviewModal.ts +++ b/app/assets/javascripts/directives/views/revisionPreviewModal.ts @@ -11,6 +11,7 @@ import { import template from '%/directives/revision-preview-modal.pug'; import { PayloadContent } from '@standardnotes/snjs'; import { confirmDialog } from '@/services/alertService'; +import { STRING_RESTORE_LOCKED_ATTEMPT } from '@/strings'; interface RevisionPreviewScope { uuid: string @@ -108,6 +109,10 @@ class RevisionPreviewModalCtrl extends PureViewCtrl implements RevisionPreviewSc }; if (!asCopy) { + if (this.originalNote.locked) { + this.application.alertService.alert(STRING_RESTORE_LOCKED_ATTEMPT); + return; + } confirmDialog({ text: "Are you sure you want to replace the current note's contents with what you see in this preview?", confirmButtonStyle: "danger" diff --git a/app/assets/javascripts/strings.ts b/app/assets/javascripts/strings.ts index 3041fa42b..05f540306 100644 --- a/app/assets/javascripts/strings.ts +++ b/app/assets/javascripts/strings.ts @@ -42,6 +42,8 @@ export const STRING_DELETE_LOCKED_ATTEMPT = "This note had editing disabled. If you'd like to delete it, enable editing, and try again."; export const STRING_EDIT_LOCKED_ATTEMPT = "This note has editing disabled. If you'd like to edit its options, enable editing, and try again."; +export const STRING_RESTORE_LOCKED_ATTEMPT = + "This note has editing disabled. If you'd like to restore a different version if it, enable editing, and try again." export function StringDeleteNote(title: string, permanently: boolean) { return permanently ? `Are you sure you want to permanently delete ${title}?`