suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow dragging parent items to collection if children are selected

Browse Source 
This is a simplified version of the fix from #872. Unlike the proposal
in #36, this doesn't require all child items to be selected, since in a
search some children might be grayed out. If the child of an unselected
parent item is included, the drag isn't allowed.

Closes #36

(cherry picked from commit 38411fb56c)
This commit is contained in:
Dan Stillman 2018-02-03 04:09:55 -05:00
parent 410976f991
commit 6ae0c6055e
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chrome/content/zotero/xpcom/collectionTreeView.js
View File

@ -1606,6 +1606,7 @@ Zotero.CollectionTreeView.prototype.canDropCheck = function (row, orient, dataTr
if (dataType == 'zotero/item') { if (dataType == 'zotero/item') {
var ids = data; var ids = data;
var items = Zotero.Items.get(ids); var items = Zotero.Items.get(ids);
items = Zotero.Items.keepParents(items);
var skip = true; var skip = true;
for (let item of items) { for (let item of items) {
// Can only drag top-level items // Can only drag top-level items
@ -2115,6 +2116,7 @@ Zotero.CollectionTreeView.prototype.drop = Zotero.Promise.coroutine(function* (r
} }
if (targetTreeRow.isPublications()) { if (targetTreeRow.isPublications()) {
items = Zotero.Items.keepParents(items);
let io = this._treebox.treeBody.ownerDocument.defaultView let io = this._treebox.treeBody.ownerDocument.defaultView
.ZoteroPane.showPublicationsWizard(items); .ZoteroPane.showPublicationsWizard(items);
if (!io) { if (!io) {

19
chrome/content/zotero/xpcom/data/items.js
View File

@ -1186,6 +1186,25 @@ Zotero.Items = function() {
}; };
/**
* Returns an array of items with children of selected parents removed
*
* @return {Zotero.Item[]}
*/
this.keepParents = function (items) {
var parentItems = new Set(
items
.filter(item => item.isTopLevelItem())
.map(item => item.id)
);
return items.filter(item => {
var parentItemID = item.parentItemID;
// Not a child item or not a child of one of the passed items
return !parentItemID || !parentItems.has(parentItemID);
});
}
/* /*
* Generate SQL to retrieve firstCreator field * Generate SQL to retrieve firstCreator field
* *

19
test/tests/itemsTest.js
View File

@ -480,4 +480,23 @@ describe("Zotero.Items", function () {
assert.instanceOf(feedItem, Zotero.FeedItem); assert.instanceOf(feedItem, Zotero.FeedItem);
}); });
}); });
describe("#keepParents()", function () {
it("should remove child items of passed items", async function () {
var item1 = await createDataObject('item');
var item2 = await createDataObject('item', { itemType: 'note', parentItemID: item1.id });
var item3 = await createDataObject('item', { itemType: 'note', parentItemID: item1.id });
var item4 = await createDataObject('item');
var item5 = await createDataObject('item', { itemType: 'note', parentItemID: item4.id });
var otherItem = await createDataObject('item');
var item6 = await createDataObject('item', { itemType: 'note', parentItemID: otherItem.id });
var items = Zotero.Items.keepParents([item1, item2, item3, item4, item5, item6]);
assert.sameMembers(
// Convert to ids for clearer output
items.map(item => item.id),
[item1, item4, item6].map(item => item.id)
);
});
});
}); });