gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 09:58:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

note revisions and file properties buttons respect protected session

Browse Source
This commit is contained in:
zadam 2022-06-13 23:03:56 +02:00
parent 4cec856e21
commit 6256bcde2d
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/public/app/dialogs/note_revisions.js
View File

@ -4,6 +4,7 @@ import toastService from "../services/toast.js";
import appContext from "../services/app_context.js"; import appContext from "../services/app_context.js";
import libraryLoader from "../services/library_loader.js"; import libraryLoader from "../services/library_loader.js";
import openService from "../services/open.js"; import openService from "../services/open.js";
import protectedSessionHolder from "../services/protected_session_holder.js";
const $dialog = $("#note-revisions-dialog"); const $dialog = $("#note-revisions-dialog");
const $list = $("#note-revision-list"); const $list = $("#note-revision-list");
@ -114,9 +115,13 @@ async function setContentPane() {
} }
}); });
if (!revisionItem.isProtected || protectedSessionHolder.isProtectedSessionAvailable()) {
$titleButtons
.append($restoreRevisionButton)
.append('   ');
}
$titleButtons $titleButtons
.append($restoreRevisionButton)
.append('   ')
.append($eraseRevisionButton) .append($eraseRevisionButton)
.append('   '); .append('   ');
@ -124,7 +129,9 @@ async function setContentPane() {
$downloadButton.on('click', () => openService.downloadNoteRevision(revisionItem.noteId, revisionItem.noteRevisionId)); $downloadButton.on('click', () => openService.downloadNoteRevision(revisionItem.noteId, revisionItem.noteRevisionId));
$titleButtons.append($downloadButton); if (!revisionItem.isProtected || protectedSessionHolder.isProtectedSessionAvailable()) {
$titleButtons.append($downloadButton);
}
const fullNoteRevision = await server.get(`notes/${revisionItem.noteId}/revisions/${revisionItem.noteRevisionId}`); const fullNoteRevision = await server.get(`notes/${revisionItem.noteId}/revisions/${revisionItem.noteRevisionId}`);

3
src/public/app/widgets/ribbon_widgets/file_properties.js
View File

@ -3,6 +3,7 @@ import NoteContextAwareWidget from "../note_context_aware_widget.js";
import toastService from "../../services/toast.js"; import toastService from "../../services/toast.js";
import openService from "../../services/open.js"; import openService from "../../services/open.js";
import utils from "../../services/utils.js"; import utils from "../../services/utils.js";
import protectedSessionHolder from "../../services/protected_session_holder.js";
const TPL = ` const TPL = `
<div class="file-properties-widget"> <div class="file-properties-widget">
@ -139,5 +140,7 @@ export default class FilePropertiesWidget extends NoteContextAwareWidget {
// open doesn't work for protected notes since it works through browser which isn't in protected session // open doesn't work for protected notes since it works through browser which isn't in protected session
this.$openButton.toggle(!note.isProtected); this.$openButton.toggle(!note.isProtected);
this.$downloadButton.toggle(!note.isProtected || protectedSessionHolder.isProtectedSessionAvailable())
this.$uploadNewRevisionButton.toggle(!note.isProtected || protectedSessionHolder.isProtectedSessionAvailable())
} }
} }