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

Fix collection drag error if standalone file and no-files group

Browse source
This commit is contained in:
Dan Stillman 2012-01-16 03:23:43 -05:00
parent bfd1c1c91f
commit 407e8ab32a
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
chrome/content/zotero/xpcom/collectionTreeView.js
View file

@ -1427,6 +1427,19 @@ Zotero.CollectionTreeView.prototype.drop = function(row, orient)
// Standalone attachment // Standalone attachment
if (item.isAttachment()) { if (item.isAttachment()) {
var linkMode = item.attachmentLinkMode;
// Skip linked files
if (linkMode == Zotero.Attachments.LINK_MODE_LINKED_FILE) {
Zotero.debug("Skipping standalone linked file attachment on drag");
return false;
}
if (!itemGroup.filesEditable) {
Zotero.debug("Skipping standalone file attachment on drag");
return false;
}
return Zotero.Attachments.copyAttachmentToLibrary(item, targetLibraryID); return Zotero.Attachments.copyAttachmentToLibrary(item, targetLibraryID);
} }
@ -1480,6 +1493,7 @@ Zotero.CollectionTreeView.prototype.drop = function(row, orient)
// Skip linked files // Skip linked files
if (linkMode == Zotero.Attachments.LINK_MODE_LINKED_FILE) { if (linkMode == Zotero.Attachments.LINK_MODE_LINKED_FILE) {
Zotero.debug("Skipping child linked file attachment on drag");
continue; continue;
} }
@ -1541,6 +1555,10 @@ Zotero.CollectionTreeView.prototype.drop = function(row, orient)
else { else {
var item = Zotero.Items.get(desc.id); var item = Zotero.Items.get(desc.id);
var id = copyItem(item, targetLibraryID); var id = copyItem(item, targetLibraryID);
// Standalone attachments might not get copied
if (!id) {
continue;
}
// Mark copied item for adding to collection // Mark copied item for adding to collection
if (parent) { if (parent) {
if (!addItems[parent]) { if (!addItems[parent]) {
@ -1550,8 +1568,6 @@ Zotero.CollectionTreeView.prototype.drop = function(row, orient)
} }
} }
} }
return collectionID;
} }
var collections = [{ var collections = [{
@ -1625,7 +1641,12 @@ Zotero.CollectionTreeView.prototype.drop = function(row, orient)
var newIDs = []; var newIDs = [];
for each(var item in newItems) { for each(var item in newItems) {
newIDs.push(copyItem(item, targetLibraryID)); var id = copyItem(item, targetLibraryID)
// Standalone attachments might not get copied
if (!id) {
continue;
}
newIDs.push(id);
} }
if (toReconcile.length) { if (toReconcile.length) {