From 3241faf50314d3f2646657d11e25dfa2ff71a650 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 23 May 2018 20:39:32 -0400 Subject: [PATCH] Fix tag saving for intercepted imports from connector Save tags in intercepted files as automatic tags --- chrome/content/zotero/xpcom/connector/server_connector.js | 1 + chrome/content/zotero/xpcom/translation/translate.js | 2 ++ test/tests/server_connectorTest.js | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/connector/server_connector.js b/chrome/content/zotero/xpcom/connector/server_connector.js index d68efe710..24774b7b5 100644 --- a/chrome/content/zotero/xpcom/connector/server_connector.js +++ b/chrome/content/zotero/xpcom/connector/server_connector.js @@ -1002,6 +1002,7 @@ Zotero.Server.Connector.Import.prototype = { let items = await translate.translate({ libraryID, collections: collection ? [collection.id] : null, + forceTagType: 1, // Import translation skips selection by default, so force it to occur saveOptions: { skipSelect: false diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js index f87cc917c..c7170f82f 100644 --- a/chrome/content/zotero/xpcom/translation/translate.js +++ b/chrome/content/zotero/xpcom/translation/translate.js @@ -1299,6 +1299,7 @@ Zotero.Translate.Base.prototype = { } this._collections = options.collections; this._saveAttachments = options.saveAttachments === undefined || options.saveAttachments; + this._forceTagType = options.forceTagType; this._saveOptions = options.saveOptions; this._savingAttachments = []; @@ -2378,6 +2379,7 @@ Zotero.Translate.Import.prototype._prepareTranslation = Zotero.Promise.method(fu this._itemSaver = new Zotero.Translate.ItemSaver({ libraryID: this._libraryID, collections: this._collections, + forceTagType: this._forceTagType, attachmentMode: Zotero.Translate.ItemSaver[(this._saveAttachments ? "ATTACHMENT_MODE_FILE" : "ATTACHMENT_MODE_IGNORE")], baseURI, saveOptions: Object.assign( diff --git a/test/tests/server_connectorTest.js b/test/tests/server_connectorTest.js index d2f6f525e..d7c39f348 100644 --- a/test/tests/server_connectorTest.js +++ b/test/tests/server_connectorTest.js @@ -731,7 +731,8 @@ describe("Connector Server", function () { title={Test1}, author={Owl}, year={1000}, - publisher={Curly Braces Publishing} + publisher={Curly Braces Publishing}, + keywords={A, B} }`; var addedItemIDsPromise = waitForItemEvent('add'); @@ -748,6 +749,8 @@ describe("Connector Server", function () { let itemIDs = yield addedItemIDsPromise; assert.isTrue(collection.hasItem(itemIDs[0])); + var item = Zotero.Items.get(itemIDs[0]); + assert.sameDeepMembers(item.getTags(), [{ tag: 'A', type: 1 }, { tag: 'B', type: 1 }]); });