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

Simplify cloning of collections and searches

Browse source
This commit is contained in:
Dan Stillman 2018-12-16 02:17:57 -05:00
parent 5f07f36ae5
commit 13d55910ed
3 changed files with 21 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
chrome/content/zotero/xpcom/collectionTreeView.js
View file

@ -2032,10 +2032,7 @@ Zotero.CollectionTreeView.prototype.drop = Zotero.Promise.coroutine(function* (r
// Collections // Collections
if (desc.type == 'collection') { if (desc.type == 'collection') {
var c = yield Zotero.Collections.getAsync(desc.id); var c = yield Zotero.Collections.getAsync(desc.id);
let newCollection = c.clone(targetLibraryID);
var newCollection = new Zotero.Collection;
newCollection.libraryID = targetLibraryID;
c.clone(false, newCollection);
if (parentID) { if (parentID) {
newCollection.parentID = parentID; newCollection.parentID = parentID;
} }

41
chrome/content/zotero/xpcom/data/collection.js
View file

@ -533,34 +533,31 @@ Zotero.Collection.prototype.diff = function (collection, includeMatches) {
/** /**
* Returns an unsaved copy of the collection * Returns an unsaved copy of the collection without id and key
* *
* Does not copy parent collection or child items * Doesn't duplicate subcollections or items, because the collection isn't saved
*
* @param {Boolean} [includePrimary=false]
* @param {Zotero.Collection} [newCollection=null]
*/ */
Zotero.Collection.prototype.clone = function (includePrimary, newCollection) { Zotero.Collection.prototype.clone = function (libraryID) {
Zotero.debug('Cloning collection ' + this.id); Zotero.debug('Cloning collection ' + this.id);
if (newCollection) { if (libraryID !== undefined && libraryID !== null && typeof libraryID !== 'number') {
var sameLibrary = newCollection.libraryID == this.libraryID; throw new Error("libraryID must be null or an integer");
}
else {
var newCollection = new this.constructor;
var sameLibrary = true;
if (includePrimary) {
newCollection.id = this.id;
newCollection.libraryID = this.libraryID;
newCollection.key = this.key;
// TODO: This isn't used, but if it were, it should probably include
// parent collection and child items
}
} }
newCollection.name = this.name; if (libraryID === undefined || libraryID === null) {
libraryID = this.libraryID;
}
var sameLibrary = libraryID == this.libraryID;
var newCollection = new Zotero.Collection;
newCollection.libraryID = libraryID;
var json = this.toJSON();
if (!sameLibrary) {
delete json.parentCollection;
delete json.relations;
}
newCollection.fromJSON(json);
return newCollection; return newCollection;
} }

13
chrome/content/zotero/xpcom/data/search.js
View file

@ -254,18 +254,7 @@ Zotero.Search.prototype._finalizeSave = Zotero.Promise.coroutine(function* (env)
Zotero.Search.prototype.clone = function (libraryID) { Zotero.Search.prototype.clone = function (libraryID) {
var s = new Zotero.Search(); var s = new Zotero.Search();
s.libraryID = libraryID === undefined ? this.libraryID : libraryID; s.libraryID = libraryID === undefined ? this.libraryID : libraryID;
s.fromJSON(this.toJSON());
var conditions = this.getConditions();
for (let condition of Object.values(conditions)) {
var name = condition.mode ?
condition.condition + '/' + condition.mode :
condition.condition
s.addCondition(name, condition.operator, condition.value,
condition.required);
}
return s; return s;
}; };