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

Sort descendant collections alphabetically in advanced search window

Browse source 
https://forums.zotero.org/discussion/50679/
This commit is contained in:
Dan Stillman 2015-07-21 00:44:38 -04:00
parent 984789d304
commit a452af6c3a
3 changed files with 149 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

20
chrome/content/zotero/bindings/zoterosearch.xml
View file

@ -405,8 +405,8 @@
]]>
</constructor>
<method name="onConditionSelected">
<body>
<![CDATA[
<body><![CDATA[
return Zotero.spawn(function* () {
// Skip if correct condition already selected
if (this.id('conditionsmenu').value==this.selectedCondition){
return;
@ -440,7 +440,7 @@
var rows = [];
var libraryID = this.parent.search.libraryID;
var cols = Zotero.getCollections(false, true, libraryID); // TODO: Replace with Zotero.Collections.getByLibrary()
var cols = yield Zotero.Collections.getByLibrary(libraryID, true);
for (var i in cols) {
// Indent subcollections
var indent = '';
@ -527,8 +527,8 @@
}
this.onOperatorSelected();
]]>
</body>
}.bind(this));
]]></body>
</method>
<method name="onOperatorSelected">
<body>
@ -597,8 +597,8 @@
<method name="initWithParentAndCondition">
<parameter name="parent"/>
<parameter name="condition"/>
<body>
<![CDATA[
<body><![CDATA[
return Zotero.spawn(function* () {
this.parent = parent;
this.conditionID = condition['id'];
@ -638,11 +638,11 @@
this.dontupdate = false;
}
this.onConditionSelected();
yield this.onConditionSelected();
this.id('conditionsmenu').focus();
]]>
</body>
}.bind(this));
]]></body>
</method>
<!-- Gets the value from the field and updates the associated search condition -->
<method name="updateSearch">

8
chrome/content/zotero/xpcom/data/collection.js
View file

@ -690,17 +690,21 @@ Zotero.Collection.prototype.getChildren = Zotero.Promise.coroutine(function* (re
// 0 == collection
// 1 == item
var sql = 'SELECT collectionID AS id, '
var sql = 'SELECT collectionID AS id, collectionName AS name, '
+ "0 AS type, collectionName AS collectionName, key "
+ 'FROM collections WHERE parentCollectionID=?1';
if (!type || type == 'item') {
sql += ' UNION SELECT itemID AS id, 1 AS type, NULL AS collectionName, key '
sql += ' UNION SELECT itemID AS id, NULL AS name, 1 AS type, NULL AS collectionName, key '
+ 'FROM collectionItems JOIN items USING (itemID) WHERE collectionID=?1';
if (!includeDeletedItems) {
sql += " AND itemID NOT IN (SELECT itemID FROM deletedItems)";
}
}
var children = yield Zotero.DB.queryAsync(sql, this.id);
children.sort(function (a, b) {
if (a.name === null || b.name === null) return 0;
return Zotero.localeCompare(a.name, b.name)
});
for(var i=0, len=children.length; i<len; i++) {
// This seems to not work without parseInt() even though

30
test/tests/collectionsTest.js
View file

@ -13,13 +13,29 @@ describe("Zotero.Collections", function () {
})
it("should get all collections in a library in recursive mode", function* () {
var col1 = yield createDataObject('collection');
var col2 = yield createDataObject('collection');
var col3 = yield createDataObject('collection', { parentID: col2.id });
var cols = yield Zotero.Collections.getByLibrary(Zotero.Libraries.userLibraryID, true);
assert.isAbove(cols.length, 2);
assert.includeMembers(cols.map(col => col.id), [col1.id, col2.id, col3.id]);
assert.ok(cols.every(col => col.libraryID == Zotero.Libraries.userLibraryID));
yield createDataObject('collection', { libraryID: (yield getGroup()).libraryID });
var libraryID = Zotero.Libraries.userLibraryID;
var col1 = yield createDataObject('collection', { name: "C" });
var col2 = yield createDataObject('collection', { name: "A" });
var col3 = yield createDataObject('collection', { name: "D", parentID: col2.id });
var col4 = yield createDataObject('collection', { name: "B", parentID: col2.id });
var col5 = yield createDataObject('collection', { name: "E", parentID: col2.id });
var col6 = yield createDataObject('collection', { name: "G", parentID: col3.id });
var col7 = yield createDataObject('collection', { name: "F", parentID: col3.id });
var cols = yield Zotero.Collections.getByLibrary(libraryID, true);
assert.isAbove(cols.length, 6);
var ids = cols.map(col => col.id);
assert.includeMembers(
ids, [col1.id, col2.id, col3.id, col4.id, col5.id, col6.id, col7.id]
);
assert.isBelow(ids.indexOf(col2.id), ids.indexOf(col4.id), "A before child B");
assert.isBelow(ids.indexOf(col4.id), ids.indexOf(col3.id), "B before D");
assert.isBelow(ids.indexOf(col3.id), ids.indexOf(col7.id), "D before child F");
assert.isBelow(ids.indexOf(col7.id), ids.indexOf(col6.id), "F before G");
assert.isBelow(ids.indexOf(col6.id), ids.indexOf(col5.id), "G before D sibling E");
assert.isBelow(ids.indexOf(col5.id), ids.indexOf(col1.id), "E before A sibling C");
assert.ok(cols.every(col => col.libraryID == libraryID));
})
})