From 01e988f07d3a233b089d740122fc52c7113a71bb Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 30 Sep 2019 04:39:54 -0400 Subject: [PATCH] Don't hard-code 'url' fieldID --- chrome/content/zotero/xpcom/data/item.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js index fd22ca0020..7dbe7fceff 100644 --- a/chrome/content/zotero/xpcom/data/item.js +++ b/chrome/content/zotero/xpcom/data/item.js @@ -3282,14 +3282,15 @@ Zotero.Item.prototype.getBestAttachments = Zotero.Promise.coroutine(function* () } var url = this.getField('url'); + var urlFieldID = Zotero.ItemFields.getID('url'); var sql = "SELECT IA.itemID FROM itemAttachments IA NATURAL JOIN items I " - + "LEFT JOIN itemData ID ON (IA.itemID=ID.itemID AND fieldID=1) " + + `LEFT JOIN itemData ID ON (IA.itemID=ID.itemID AND fieldID=${urlFieldID}) ` + "LEFT JOIN itemDataValues IDV ON (ID.valueID=IDV.valueID) " - + "WHERE parentItemID=? AND linkMode NOT IN (?) " + + `WHERE parentItemID=? AND linkMode NOT IN (${Zotero.Attachments.LINK_MODE_LINKED_URL}) ` + "AND IA.itemID NOT IN (SELECT itemID FROM deletedItems) " + "ORDER BY contentType='application/pdf' DESC, value=? DESC, dateAdded ASC"; - var itemIDs = yield Zotero.DB.columnQueryAsync(sql, [this.id, Zotero.Attachments.LINK_MODE_LINKED_URL, url]); + var itemIDs = yield Zotero.DB.columnQueryAsync(sql, [this.id, url]); return this.ObjectsClass.get(itemIDs); });