mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix CR attachment box (#4430)

Browse source
This commit is contained in:
windingwind 2024-07-25 23:35:50 +08:00 committed by Dan Stillman
parent 15fa86410d
commit 99a2b83cb6
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
chrome/content/zotero/elements/attachmentBox.js
View file

@ -317,6 +317,7 @@
let selectButton = this._id('select-button'); let selectButton = this._id('select-button');
let fileExists = this._item.isFileAttachment() && await this._item.fileExists(); let fileExists = this._item.isFileAttachment() && await this._item.fileExists();
let isMerge = ["merge", "mergeedit", "filemerge"].includes(this.mode);
let isImportedURL = this.item.attachmentLinkMode == Zotero.Attachments.LINK_MODE_IMPORTED_URL; let isImportedURL = this.item.attachmentLinkMode == Zotero.Attachments.LINK_MODE_IMPORTED_URL;
let isLinkedURL = this.item.attachmentLinkMode == Zotero.Attachments.LINK_MODE_LINKED_URL; let isLinkedURL = this.item.attachmentLinkMode == Zotero.Attachments.LINK_MODE_LINKED_URL;
@ -392,7 +393,7 @@
pagesRow.hidden = true; pagesRow.hidden = true;
} }
if (this.displayDateModified && fileExists && !this._item.isWebAttachment()) { if (this.displayDateModified && (fileExists || isMerge) && !this._item.isWebAttachment()) {
// Conflict resolution uses a modal window, so promises won't work, but // Conflict resolution uses a modal window, so promises won't work, but
// the sync process passes in the file mod time as dateModified // the sync process passes in the file mod time as dateModified
if (this.synchronous) { if (this.synchronous) {

1
chrome/content/zotero/elements/mergeGroup.js
View file

@ -142,7 +142,6 @@
this._mergePane.libraryID = this.libraryID; this._mergePane.libraryID = this.libraryID;
this._leftPane.data = this._data.left; this._leftPane.data = this._data.left;
this._rightPane.data = this._data.right; this._rightPane.data = this._data.right;
this._mergePane.data = this._data.merge;
if (this._data.selected == 'left') { if (this._data.selected == 'left') {
this.choosePane(this._leftPane); this.choosePane(this._leftPane);