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

Fix error modifying existing saved search with more than 1 condition

Browse source 
Closes #1056, which wasn't actually the problem
This commit is contained in:
Dan Stillman 2016-07-07 07:55:15 -04:00
parent 18cf6088b0
commit c1f7a188e2
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chrome/content/zotero/xpcom/search.js
View file

@ -440,7 +440,7 @@ Zotero.Search.prototype.removeCondition = function (searchConditionID) {
this._requireData('conditions'); this._requireData('conditions');
if (typeof this._conditions[searchConditionID] == 'undefined'){ if (typeof this._conditions[searchConditionID] == 'undefined'){
throw ('Invalid searchConditionID ' + searchConditionID + ' in removeCondition()'); throw new Error('Invalid searchConditionID ' + searchConditionID + ' in removeCondition()');
} }
delete this._conditions[searchConditionID]; delete this._conditions[searchConditionID];
@ -825,7 +825,7 @@ Zotero.Search.prototype.fromJSON = function (json) {
} }
this.name = json.name; this.name = json.name;
Object.keys(this.getConditions()).forEach(id => this.removeCondition(0)); Object.keys(this.getConditions()).forEach(id => this.removeCondition(id));
for (let i = 0; i < json.conditions.length; i++) { for (let i = 0; i < json.conditions.length; i++) {
let condition = json.conditions[i]; let condition = json.conditions[i];
this.addCondition( this.addCondition(

1
test/content/support.js
View file

@ -386,6 +386,7 @@ function createUnsavedDataObject(objectType, params = {}) {
if (objectType == 'search') { if (objectType == 'search') {
obj.addCondition('title', 'contains', Zotero.Utilities.randomString()); obj.addCondition('title', 'contains', Zotero.Utilities.randomString());
obj.addCondition('title', 'isNot', Zotero.Utilities.randomString());
} }
Zotero.Utilities.assignProps(obj, params, allowedParams); Zotero.Utilities.assignProps(obj, params, allowedParams);

1
test/tests/searchTest.js
View file

@ -221,6 +221,7 @@ describe("Zotero.Search", function() {
let s = new Zotero.Search(); let s = new Zotero.Search();
s.name = "Test"; s.name = "Test";
s.addCondition('joinMode', 'any'); s.addCondition('joinMode', 'any');
s.addCondition('title', 'isNot', 'foo');
let json = s.toJSON(); let json = s.toJSON();
json.name = "Test 2"; json.name = "Test 2";
json.conditions = [ json.conditions = [