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

Fix #956, 5.0: Merging of duplicate items is not working

Browse source
This commit is contained in:
Dan Stillman 2016-04-24 02:44:21 -04:00
parent c6444c29de
commit a91957c588
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
chrome/content/zotero/xpcom/data/relations.js
View file

@ -149,7 +149,8 @@ Zotero.Relations = new function () {
this.getByObject = function (objectType, object) { this.getByObject = function (objectType, object) {
var objectsClass = Zotero.DataObjectUtilities.getObjectsClassForObjectType(objectType); var objectsClass = Zotero.DataObjectUtilities.getObjectsClassForObjectType(objectType);
var predicateIDs = []; var predicateIDs = [];
var o = _subjectPredicatesByObject[objectType][object]; var o = _subjectPredicatesByObject[objectType]
? _subjectPredicatesByObject[objectType][object] : false;
if (!o) { if (!o) {
return []; return [];
} }

6
test/tests/duplicatesTest.js
View file

@ -3,6 +3,12 @@
describe("Duplicate Items", function () { describe("Duplicate Items", function () {
var win, zp, cv; var win, zp, cv;
before(function* () {
yield resetDB({
thisArg: this,
skipBundledFiles: true
});
});
beforeEach(function* () { beforeEach(function* () {
Zotero.Prefs.clear('duplicateLibraries'); Zotero.Prefs.clear('duplicateLibraries');
win = yield loadZoteroPane(); win = yield loadZoteroPane();