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

Don't delete valid item/CSL type from Type in Extra on sync

Browse source 
After a local item change, Zotero uploads the JSON and then applies the
saved JSON returned from the API to the local object using `fromJSON()`,
the same as it would apply any other remote change.

`fromJSON()` is meant to migrate Extra lines into real types and fields
after future item type/field changes. It calls
`Z.Utilities.Internal.extractExtraFields()`, which looks for valid item
type or CSL type values in Type lines in Extra, handles the rest of
parsing accordingly, and passes back the parsed item type. `fromJSON()`
wasn't handling `itemType` in the response object, so the item type
didn't get applied and the Type line was stripped. This fixes that.

Since valid type values are now parsed, if you have a Journal Article
item with a Pages field and enter "Type: song" into Extra and sync, the
item will be converted to Audio Recording and `Pages: 123` will be
placed in Extra.

https://forums.zotero.org/discussion/comment/369221/#Comment_369221
This commit is contained in:
Dan Stillman 2020-11-25 03:18:07 -05:00
parent 17cafcb013
commit 84730e610c
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4239,13 +4239,18 @@ Zotero.Item.prototype.fromJSON = function (json, options = {}) {
var isValidForType = {}; var isValidForType = {};
var setFields = new Set(); var setFields = new Set();
var { fields: extraFields, creators: extraCreators, extra } = Zotero.Utilities.Internal.extractExtraFields( var { itemType, fields: extraFields, creators: extraCreators, extra } =
json.extra || '', Zotero.Utilities.Internal.extractExtraFields(
this, json.extra || '',
Object.keys(json) this,
// TEMP until we move creator lines to real creators Object.keys(json)
.concat('creators') // TEMP until we move creator lines to real creators
); .concat('creators')
);
if (json.itemType != itemType) {
itemTypeID = Zotero.ItemTypes.getID(itemType);
this.setType(itemTypeID);
}
var invalidFieldLogLines = new Map(); var invalidFieldLogLines = new Map();
// Transfer valid fields from Extra to regular fields // Transfer valid fields from Extra to regular fields

13
test/tests/itemTest.js
View file

@ -1883,6 +1883,19 @@ describe("Zotero.Item", function () {
assert.equal(item.getField('extra'), `doi: ${doi2}`); assert.equal(item.getField('extra'), `doi: ${doi2}`);
});*/ });*/
it("should use valid CSL type from Extra", function () {
var json = {
itemType: "journalArticle",
pages: "123",
extra: "Type: song"
};
var item = new Zotero.Item;
item.fromJSON(json);
assert.equal(item.itemTypeID, Zotero.ItemTypes.getID('audioRecording'));
// A field valid for the old item type should be moved to Extra
assert.equal(item.getField('extra'), 'Pages: 123');
});
it("should ignore creator field in Extra", async function () { it("should ignore creator field in Extra", async function () {
var json = { var json = {
itemType: "journalArticle", itemType: "journalArticle",