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

Fix clearing of missing fields in Item::fromJSON()

Browse source
This commit is contained in:
Dan Stillman 2016-07-18 19:56:50 -04:00
parent 35d057decb
commit 7b45b920fc
2 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4006,6 +4006,7 @@ Zotero.Item.prototype.fromJSON = function (json) {
} }
if (field == 'accessDate') { if (field == 'accessDate') {
this.setField(field, val); this.setField(field, val);
setFields[field] = true;
} }
else { else {
this[field] = val; this[field] = val;
@ -4072,16 +4073,21 @@ Zotero.Item.prototype.fromJSON = function (json) {
+ this.libraryKey); + this.libraryKey);
continue; continue;
} }
isValidForType[field] = Zotero.ItemFields.isValidForType( // Convert to base-mapped field if necessary, so that setFields has the base-mapped field
Zotero.ItemFields.getFieldIDFromTypeAndBase(itemTypeID, fieldID) || fieldID, // when it's checked for values from getUsedFields() below
this.itemTypeID let origFieldID = fieldID;
); let origField = field;
fieldID = Zotero.ItemFields.getFieldIDFromTypeAndBase(itemTypeID, fieldID) || fieldID;
if (origFieldID != fieldID) {
field = Zotero.ItemFields.getName(fieldID);
}
isValidForType[field] = Zotero.ItemFields.isValidForType(fieldID, this.itemTypeID);
if (!isValidForType[field]) { if (!isValidForType[field]) {
Zotero.logError("Discarding invalid field '" + field + "' for type " + itemTypeID Zotero.logError("Discarding invalid field '" + origField + "' for type " + itemTypeID
+ " for item " + this.libraryKey); + " for item " + this.libraryKey);
continue; continue;
} }
this.setField(field, json[field]); this.setField(field, json[origField]);
setFields[field] = true; setFields[field] = true;
} }
} }
@ -4089,8 +4095,7 @@ Zotero.Item.prototype.fromJSON = function (json) {
// Clear existing fields not specified // Clear existing fields not specified
var previousFields = this.getUsedFields(true); var previousFields = this.getUsedFields(true);
for (let field of previousFields) { for (let field of previousFields) {
// Invalid fields will already have been cleared by the type change if (!setFields[field] && isValidForType[field] !== false) {
if (!setFields[field] && isValidForType[field]) {
this.setField(field, false); this.setField(field, false);
} }
} }

19
test/tests/itemTest.js
View file

@ -1194,8 +1194,25 @@ describe("Zotero.Item", function () {
}); });
}) })
}) })
describe("#fromJSON()", function () { describe("#fromJSON()", function () {
it("should clear missing fields", function* () {
var item = new Zotero.Item('book');
item.setField('title', 'Test');
item.setField('date', '2016');
item.setField('accessDate', '2015-06-07T20:56:00Z');
yield item.saveTx();
var json = item.toJSON();
// Remove fields, which should cause them to be cleared in fromJSON()
delete json.date;
delete json.accessDate;
item.fromJSON(json);
assert.strictEqual(item.getField('title'), 'Test');
assert.strictEqual(item.getField('date'), '');
assert.strictEqual(item.getField('accessDate'), '');
});
it("should ignore unknown fields", function* () { it("should ignore unknown fields", function* () {
var json = { var json = {
itemType: "journalArticle", itemType: "journalArticle",