From 43bd1af3e9d74b85f2db712a7b12143d4d2a1e10 Mon Sep 17 00:00:00 2001 From: Martynas Bagdonas Date: Tue, 8 Jun 2021 10:10:21 +0300 Subject: [PATCH] Prepare read-only check for group library annotations --- chrome/content/zotero/xpcom/annotations.js | 3 +++ chrome/content/zotero/xpcom/reader.js | 1 - pdf-reader | 2 +- pdf-worker | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/chrome/content/zotero/xpcom/annotations.js b/chrome/content/zotero/xpcom/annotations.js index 200f400f81..ee27952576 100644 --- a/chrome/content/zotero/xpcom/annotations.js +++ b/chrome/content/zotero/xpcom/annotations.js @@ -120,6 +120,9 @@ Zotero.Annotations = new function () { if (!o.isAuthor) { o.authorName = Zotero.Users.getName(item.createdByUserID); } + // TODO: Replace this with the actual code that checks if user is a group admin + let isGroupAdmin = false; + o.readOnly = o.isExternal || (!o.isAuthor && !isGroupAdmin); if (o.type == 'highlight') { o.text = item.annotationText; } diff --git a/chrome/content/zotero/xpcom/reader.js b/chrome/content/zotero/xpcom/reader.js index 40d445176f..731049122d 100644 --- a/chrome/content/zotero/xpcom/reader.js +++ b/chrome/content/zotero/xpcom/reader.js @@ -608,7 +608,6 @@ class ReaderInstance { } let json = await Zotero.Annotations.toJSON(item); json.id = item.key; - json.readOnly = !json.isAuthor || json.isExternal; delete json.key; for (let key in json) { json[key] = json[key] || ''; diff --git a/pdf-reader b/pdf-reader index c25c3f4f8b..e6c7f500e6 160000 --- a/pdf-reader +++ b/pdf-reader @@ -1 +1 @@ -Subproject commit c25c3f4f8b40c964ed8eed0c81b2a8845ec1b5ee +Subproject commit e6c7f500e60c474531b7604457f412ab449c2dde diff --git a/pdf-worker b/pdf-worker index 1d8e8ed20b..41f952bccf 160000 --- a/pdf-worker +++ b/pdf-worker @@ -1 +1 @@ -Subproject commit 1d8e8ed20b466963192ebf7aa713c1c97e9d89d7 +Subproject commit 41f952bccf4e038888791a120e41f0eeae1f2458