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

Fix wrongly shown error upon bibliography insertion (since 96d6114c)

Browse source
This commit is contained in:
Adomas Venčkauskas 2019-04-30 09:56:35 +03:00
parent f5404bc7ee
commit 17aca346c6
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
chrome/content/zotero/xpcom/integration.js
View file

@ -1427,10 +1427,15 @@ Zotero.Integration.Session.prototype.init = Zotero.Promise.coroutine(function *(
var data = this.data;
var haveFields = false;
let fieldTypes = [this._app.primaryFieldType, this._app.secondaryFieldType];
if (data.prefs.fieldType) {
fieldTypes = [data.prefs.fieldType];
}
// If prefs not present
if (require && !data.prefs.fieldType) {
if (require) {
// check to see if fields already exist
for (let fieldType of [this.primaryFieldType, this.secondaryFieldType]) {
for (let fieldType of fieldTypes) {
var fields = yield this._doc.getFields(fieldType);
if (fields.length) {
haveFields = true;
@ -1439,13 +1444,13 @@ Zotero.Integration.Session.prototype.init = Zotero.Promise.coroutine(function *(
}
}
if (require && (!haveFields && data.prefs.fieldType)) {
// If required but no fields and preferences exist throw an error
if (require && !haveFields) {
// If required but no fields throw an error
return Zotero.Promise.reject(new Zotero.Exception.Alert(
"integration.error.mustInsertCitation",
[], "integration.error.title"));
} else if (!data.prefs.fieldType) {
Zotero.debug("Integration: No document preferences found, but found "+data.prefs.fieldType+" fields");
"integration.error.mustInsertCitation",
[], "integration.error.title"));
}
if (!data.prefs.fieldType) {
// Unless explicitly disabled
if (dontRunSetDocPrefs) return false;