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

Create import collection by default if there are non-trash items

Browse Source 
Follow-up to 7494e4d88c, which only checked for collections
This commit is contained in:
Dan Stillman 2018-06-08 05:57:20 -04:00
parent 337144a5eb
commit 3c70dee5c1
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
chrome/content/zotero/import/importWizard.js
View File

@ -13,10 +13,19 @@ var Zotero_Import_Wizard = {
document.getElementById('radio-import-source-mendeley').hidden = false; document.getElementById('radio-import-source-mendeley').hidden = false;
} }
// If no existing collections in the library, don't create a new collection by default // If no existing collections or non-trash items in the library, don't create a new
// collection by default
var args = window.arguments[0].wrappedJSObject; var args = window.arguments[0].wrappedJSObject;
if (args && args.libraryID) { if (args && args.libraryID) {
let sql = "SELECT ROWID FROM collections WHERE libraryID=? LIMIT 1"; let sql = "SELECT ROWID FROM collections WHERE libraryID=?1 "
+ "UNION "
+ "SELECT ROWID FROM items WHERE libraryID=?1 "
// Not in trash
+ "AND itemID NOT IN (SELECT itemID FROM deletedItems) "
// And not a child item (which doesn't necessarily show up in the trash)
+ "AND itemID NOT IN (SELECT itemID FROM itemNotes WHERE parentItemID IS NOT NULL) "
+ "AND itemID NOT IN (SELECT itemID FROM itemAttachments WHERE parentItemID IS NOT NULL) "
+ "LIMIT 1";
if (!await Zotero.DB.valueQueryAsync(sql, args.libraryID)) { if (!await Zotero.DB.valueQueryAsync(sql, args.libraryID)) {
document.getElementById('create-collection-checkbox').removeAttribute('checked'); document.getElementById('create-collection-checkbox').removeAttribute('checked');
} }