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

Honor .synced on data objects in all cases

Browse source 
Previously, if .synced was already true, setting it to true and saving
would result in .synced == false unless skipSyncedUpdate was passed. Now
the value assigned to .synced is always used on the next save. If the
value hasn't changed and no other values have changed, a save will be a
no-op.
This commit is contained in:
Dan Stillman 2015-07-19 17:17:32 -04:00
parent 93b5694420
commit 4f55f28e7d
3 changed files with 128 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
chrome/content/zotero/xpcom/data/dataObject.js
View file

@ -128,7 +128,7 @@ Zotero.DataObject.prototype._set = function (field, value) {
break;
}
if (this['_' + field] != value) {
if (this['_' + field] != value || field == 'synced') {
this._markFieldChange(field, this['_' + field]);
if (!this._changed.primaryData) {
this._changed.primaryData = {};
@ -905,8 +905,14 @@ Zotero.DataObject.prototype.saveTx = function (options) {
Zotero.DataObject.prototype.hasChanged = function() {
Zotero.debug(this._changed);
return !!Object.keys(this._changed).filter(dataType => this._changed[dataType]).length
var changed = Object.keys(this._changed).filter(dataType => this._changed[dataType]);
if (changed.length == 1
&& changed[0] == 'primaryData'
&& this._changed.primaryData.synced
&& this._previousData.synced == this._synced) {
return false;
}
return !!changed.length;
}
Zotero.DataObject.prototype._initSave = Zotero.Promise.coroutine(function* (env) {

2
chrome/content/zotero/xpcom/data/item.js
View file

@ -685,7 +685,7 @@ Zotero.Item.prototype.setField = function(field, value, loadIn) {
*/
// If field value has changed
if (this['_' + field] != value) {
if (this['_' + field] != value || field == 'synced') {
Zotero.debug("Field '" + field + "' has changed from '" + this['_' + field] + "' to '" + value + "'", 4);
// Save a copy of the field before modifying

141
test/tests/dataObjectTest.js
View file

@ -45,54 +45,131 @@ describe("Zotero.DataObject", function() {
})
describe("#synced", function () {
it("should be set to false after creating item", function* () {
var item = new Zotero.Item("book");
var id = yield item.saveTx();
assert.isFalse(item.synced);
yield item.eraseTx();
it("should be set to false after creating object", function* () {
for (let type of types) {
var obj = createUnsavedDataObject(type);
var id = yield obj.saveTx();
assert.isFalse(obj.synced);
yield obj.eraseTx();
}
});
it("should be set to true when changed", function* () {
var item = new Zotero.Item("book");
var id = yield item.saveTx();
it("should be set to false after modifying object", function* () {
for (let type of types) {
var obj = createUnsavedDataObject(type);
var id = yield obj.saveTx();
item.synced = 1;
yield item.saveTx();
assert.ok(item.synced);
obj.synced = true;
yield obj.saveTx();
yield item.eraseTx();
if (type == 'item') {
yield obj.loadItemData();
obj.setField('title', Zotero.Utilities.randomString());
}
else {
obj.name = Zotero.Utilities.randomString();
}
yield obj.saveTx();
assert.isFalse(obj.synced);
yield obj.eraseTx();
}
});
it("should be set to false after modifying item", function* () {
var item = new Zotero.Item("book");
var id = yield item.saveTx();
it("should be changed to true explicitly with no other changes", function* () {
for (let type of types) {
var obj = createUnsavedDataObject(type);
var id = yield obj.saveTx();
item.synced = 1;
yield item.saveTx();
obj.synced = true;
yield obj.saveTx();
assert.isTrue(obj.synced);
yield item.loadItemData();
item.setField('title', 'test');
yield item.saveTx();
assert.isFalse(item.synced);
yield item.eraseTx();
yield obj.eraseTx();
}
});
it("should be changed to true explicitly with other field changes", function* () {
for (let type of types) {
var obj = createUnsavedDataObject(type);
var id = yield obj.saveTx();
if (type == 'item') {
obj.setField('title', Zotero.Utilities.randomString());
}
else {
obj.name = Zotero.Utilities.randomString();
}
obj.synced = true;
yield obj.saveTx();
assert.isTrue(obj.synced);
yield obj.eraseTx();
}
});
it("should remain at true if set explicitly", function* () {
for (let type of types) {
var obj = createUnsavedDataObject(type);
obj.synced = true;
var id = yield obj.saveTx();
assert.isTrue(obj.synced);
if (type == 'item') {
obj.setField('title', 'test');
}
else {
obj.name = Zotero.Utilities.randomString();
}
obj.synced = true;
yield obj.saveTx();
assert.isTrue(obj.synced);
yield obj.eraseTx();
}
});
it("shouldn't cause a save if unchanged and nothing else changed", function* () {
for (let type of types) {
var obj = createUnsavedDataObject(type);
obj.synced = true;
var id = yield obj.saveTx();
assert.isTrue(obj.synced);
obj.synced = true;
assert.isFalse(obj.hasChanged(), type + " shouldn't be changed");
var obj = createUnsavedDataObject(type);
obj.synced = false;
var id = yield obj.saveTx();
assert.isFalse(obj.synced);
obj.synced = false;
assert.isFalse(obj.hasChanged(), type + " shouldn't be changed");
}
})
it("should be unchanged if skipSyncedUpdate passed", function* () {
var item = new Zotero.Item("book");
var id = yield item.saveTx();
for (let type of types) {
var obj = createUnsavedDataObject(type);
var id = yield obj.saveTx();
item.synced = 1;
yield item.saveTx();
obj.synced = 1;
yield obj.saveTx();
yield item.loadItemData();
item.setField('title', 'test');
yield item.saveTx({
if (type == 'item') {
yield obj.loadItemData();
obj.setField('title', Zotero.Utilities.randomString());
}
else {
obj.name = Zotero.Utilities.randomString();
}
yield obj.saveTx({
skipSyncedUpdate: true
});
assert.ok(item.synced);
assert.ok(obj.synced);
yield item.eraseTx();
yield obj.eraseTx();
}
});
})