www

commit 00d85fb6da943f6559d080979aa57a09a8fc3c8d
parent 0f6b7129634f33ce942aef456f0f6add5a0dc1ee
Author: Dan Stillman <dstillman@zotero.org>
Date:   Thu, 29 Mar 2018 07:16:40 -0400

Update parent item from target selector if item was made a child item

This is necessary for automatic PDF recognition.

Addresses zotero/zotero-connectors#220

Diffstat:
M
chrome/content/zotero/xpcom/server_connector.js
 | 
26
++++++++++++++------------

1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/chrome/content/zotero/xpcom/server_connector.js b/chrome/content/zotero/xpcom/server_connector.js
@@ -145,12 +145,13 @@ Zotero.Server.Connector.SaveSession.prototype.update = async function (libraryID
 	
 	// TODO: Update active item saver
 	
-	// If a single item was saved, select it
+	// If a single item was saved, select it (or its parent, if it now has one)
 	if (win && win.collectionsView) {
 		if (this._objects && this._objects.item) {
-			let items = Array.from(this._objects.item).filter(item => item.isTopLevelItem());
-			if (items.length == 1) {
-				await win.selectItem(items[0].id);
+			if (this._objects.item.size == 1) {
+				let item = Array.from(this._objects.item)[0];
+				item = item.isTopLevelItem() ? item : item.parentItem;
+				await win.selectItem(item.id);
 			}
 		}
 	}
@@ -192,14 +193,15 @@ Zotero.Server.Connector.SaveSession.prototype._updateObjects = async function (o
 					throw new Error("Can't move objects between libraries");
 				}
 				
-				// Keep automatic tags
-				let originalTags = object.getTags().filter(tag => tag.type == 1);
-				
-				// Assign manual tags and collections to top-level items
-				if (objectType == 'item' && object.isTopLevelItem()) {
-					object.setTags(originalTags.concat(tags));
-					object.setCollections(collectionID ? [collectionID] : []);
-					await object.save();
+				// Assign manual tags and collections to the item, or the parent item if it's now
+				// a child item (e.g., from Retrieve Metadata for PDF)
+				if (objectType == 'item') {
+					let item = object.isTopLevelItem() ? object : object.parentItem;
+					// Keep automatic tags
+					let originalTags = item.getTags().filter(tag => tag.type == 1);
+					item.setTags(originalTags.concat(tags));
+					item.setCollections(collectionID ? [collectionID] : []);
+					await item.save();
 				}
 			}
 		}