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

Fix loadAllData() on regular items without notes

Browse source 
Set a flag when setting the item type that instructs loadAllData()
whether to attempt to call loadNote()
This commit is contained in:
Dan Stillman 2015-05-05 14:39:24 -04:00
parent beb17436f8
commit 01f04802f0
3 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,6 +51,7 @@ Zotero.DataObject = function () {
this._parentKey = null;
this._loaded = {};
this._skipDataTypeLoad = {};
this._markAllDataTypeLoadStates(false);
this._clearChanged();
@ -471,7 +472,10 @@ Zotero.DataObject.prototype._loadDataType = function (dataType, reload) {
Zotero.DataObject.prototype.loadAllData = function (reload) {
let loadPromises = new Array(this._dataTypes.length);
for (let i=0; i<this._dataTypes.length; i++) {
loadPromises[i] = this._loadDataType(this._dataTypes[i], reload);
let type = this._dataTypes[i];
if (!this._skipDataTypeLoad[type]) {
loadPromises[i] = this._loadDataType(type, reload);
}
}
return Zotero.Promise.all(loadPromises);

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

@ -463,6 +463,11 @@ Zotero.Item.prototype.setType = function(itemTypeID, loadIn) {
return true;
}
// Adjust 'note' data type based on whether the item is an attachment or note
var isAttachment = Zotero.ItemTypes.getID('attachment') == itemTypeID;
var isNote = Zotero.ItemTypes.getID('note') == itemTypeID;
this._skipDataTypeLoad.note = !(isAttachment || isNote);
var oldItemTypeID = this._itemTypeID;
if (oldItemTypeID) {
if (loadIn) {

26
test/tests/dataObjectTest.js
View file

@ -3,6 +3,32 @@
describe("Zotero.DataObject", function() {
var types = ['collection', 'item', 'search'];
describe("#loadAllData()", function () {
it("should load data on a regular item", function* () {
var item = new Zotero.Item('book');
var id = yield item.save();
item = yield Zotero.Items.getAsync(id);
yield item.loadAllData();
assert.throws(item.getNote.bind(item), 'getNote() can only be called on notes and attachments');
})
it("should load data on an attachment item", function* () {
var item = new Zotero.Item('attachment');
var id = yield item.save();
item = yield Zotero.Items.getAsync(id);
yield item.loadAllData();
assert.equal(item.getNote(), '');
})
it("should load data on a note item", function* () {
var item = new Zotero.Item('note');
var id = yield item.save();
item = yield Zotero.Items.getAsync(id);
yield item.loadAllData();
assert.equal(item.getNote(), '');
})
})
describe("#save()", function () {
it("should add new identifiers to cache", function* () {
// Collection