suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix skipClientDateModifiedUpdate DataObject save option

Browse Source
This commit is contained in:
Dan Stillman 2017-06-16 01:56:43 -04:00
parent 8de0b024f0
commit 2f93065986
4 changed files with 56 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chrome/content/zotero/xpcom/data/collection.js
View File

@ -286,6 +286,7 @@ Zotero.Collection.prototype._saveData = Zotero.Promise.coroutine(function* (env)
env.parent ? env.parent : null env.parent ? env.parent : null
); );
if (env.sqlColumns.length) {
if (isNew) { if (isNew) {
env.sqlColumns.unshift('collectionID'); env.sqlColumns.unshift('collectionID');
env.sqlValues.unshift(collectionID ? { int: collectionID } : null); env.sqlValues.unshift(collectionID ? { int: collectionID } : null);
@ -301,6 +302,7 @@ Zotero.Collection.prototype._saveData = Zotero.Promise.coroutine(function* (env)
env.sqlValues.push(collectionID ? { int: collectionID } : null); env.sqlValues.push(collectionID ? { int: collectionID } : null);
yield Zotero.DB.queryAsync(sql, env.sqlValues); yield Zotero.DB.queryAsync(sql, env.sqlValues);
} }
}
if (this._changed.parentKey) { if (this._changed.parentKey) {
// Add this item to the parent's cached item lists after commit, // Add this item to the parent's cached item lists after commit,

2
chrome/content/zotero/xpcom/data/dataObject.js
View File

@ -959,7 +959,7 @@ Zotero.DataObject.prototype._saveData = function (env) {
env.sqlValues.push(0); env.sqlValues.push(0);
} }
if (env.isNew || !env.options.skipClientDateModified) { if (env.isNew || !env.options.skipClientDateModifiedUpdate) {
env.sqlColumns.push('clientDateModified'); env.sqlColumns.push('clientDateModified');
env.sqlValues.push(Zotero.DB.transactionDateTime); env.sqlValues.push(Zotero.DB.transactionDateTime);
} }

2
chrome/content/zotero/xpcom/data/item.js
View File

@ -1268,6 +1268,7 @@ Zotero.Item.prototype._saveData = Zotero.Promise.coroutine(function* (env) {
env.sqlValues.push(this.dateModified); env.sqlValues.push(this.dateModified);
} }
if (env.sqlColumns.length) {
if (isNew) { if (isNew) {
env.sqlColumns.push('dateAdded'); env.sqlColumns.push('dateAdded');
env.sqlValues.push(this.dateAdded ? this.dateAdded : Zotero.DB.transactionDateTime); env.sqlValues.push(this.dateAdded ? this.dateAdded : Zotero.DB.transactionDateTime);
@ -1292,6 +1293,7 @@ Zotero.Item.prototype._saveData = Zotero.Promise.coroutine(function* (env) {
Zotero.Notifier.queue('modify', 'item', itemID, env.notifierData, env.options.notifierQueue); Zotero.Notifier.queue('modify', 'item', itemID, env.notifierData, env.options.notifierQueue);
} }
} }
}
// //
// ItemData // ItemData

2
chrome/content/zotero/xpcom/data/search.js
View File

@ -171,6 +171,7 @@ Zotero.Search.prototype._saveData = Zotero.Promise.coroutine(function* (env) {
{ string: this.name } { string: this.name }
); );
if (env.sqlColumns.length) {
if (isNew) { if (isNew) {
env.sqlColumns.unshift('savedSearchID'); env.sqlColumns.unshift('savedSearchID');
env.sqlValues.unshift(searchID ? { int: searchID } : null); env.sqlValues.unshift(searchID ? { int: searchID } : null);
@ -186,6 +187,7 @@ Zotero.Search.prototype._saveData = Zotero.Promise.coroutine(function* (env) {
env.sqlValues.push(searchID ? { int: searchID } : null); env.sqlValues.push(searchID ? { int: searchID } : null);
yield Zotero.DB.queryAsync(sql, env.sqlValues); yield Zotero.DB.queryAsync(sql, env.sqlValues);
} }
}
if (this._changed.conditions) { if (this._changed.conditions) {
if (!isNew) { if (!isNew) {