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

Fix "Reset File Sync History"

Browse source
This commit is contained in:
Dan Stillman 2016-12-22 10:00:40 -05:00
parent cf686c520a
commit ab959cd858
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chrome/content/zotero/preferences/preferences_sync.js
View file

@ -408,7 +408,7 @@ Zotero_Preferences.Sync = {
var newEnabled = document.getElementById('pref-storage-enabled').value; var newEnabled = document.getElementById('pref-storage-enabled').value;
if (oldProtocol != newProtocol) { if (oldProtocol != newProtocol) {
yield Zotero.Sync.Storage.Local.resetModeSyncStates(oldProtocol); yield Zotero.Sync.Storage.Local.resetAllSyncStates();
} }
if (oldProtocol == 'webdav') { if (oldProtocol == 'webdav') {
@ -751,7 +751,7 @@ Zotero_Preferences.Sync = {
switch (index) { switch (index) {
case 0: case 0:
Zotero.Sync.Storage.resetAllSyncStates(); yield Zotero.Sync.Storage.Local.resetAllSyncStates();
ps.alert( ps.alert(
null, null,
"File Sync History Cleared", "File Sync History Cleared",

3
chrome/content/zotero/xpcom/storage/storageLocal.js
View file

@ -500,7 +500,7 @@ Zotero.Sync.Storage.Local = {
* This is used when switching between storage modes in the preferences so that all existing files * This is used when switching between storage modes in the preferences so that all existing files
* are uploaded via the new mode if necessary. * are uploaded via the new mode if necessary.
*/ */
resetModeSyncStates: Zotero.Promise.coroutine(function* () { resetAllSyncStates: Zotero.Promise.coroutine(function* () {
var sql = "SELECT itemID FROM items JOIN itemAttachments USING (itemID) " var sql = "SELECT itemID FROM items JOIN itemAttachments USING (itemID) "
+ "WHERE libraryID=? AND itemTypeID=? AND linkMode IN (?, ?)"; + "WHERE libraryID=? AND itemTypeID=? AND linkMode IN (?, ?)";
var params = [ var params = [
@ -514,7 +514,6 @@ Zotero.Sync.Storage.Local = {
let item = Zotero.Items.get(itemID); let item = Zotero.Items.get(itemID);
item._attachmentSyncState = this.SYNC_STATE_TO_UPLOAD; item._attachmentSyncState = this.SYNC_STATE_TO_UPLOAD;
} }
sql = "UPDATE itemAttachments SET syncState=? WHERE itemID IN (" + sql + ")"; sql = "UPDATE itemAttachments SET syncState=? WHERE itemID IN (" + sql + ")";
yield Zotero.DB.queryAsync(sql, [this.SYNC_STATE_TO_UPLOAD].concat(params)); yield Zotero.DB.queryAsync(sql, [this.SYNC_STATE_TO_UPLOAD].concat(params));
}), }),

4
test/tests/storageLocalTest.js
View file

@ -102,14 +102,14 @@ describe("Zotero.Sync.Storage.Local", function () {
}) })
}) })
describe("#resetModeSyncStates()", function () { describe("#resetAllSyncStates()", function () {
it("should reset attachment sync states to 'to_upload'", function* () { it("should reset attachment sync states to 'to_upload'", function* () {
var attachment = yield importFileAttachment('test.png'); var attachment = yield importFileAttachment('test.png');
attachment.attachmentSyncState = 'in_sync'; attachment.attachmentSyncState = 'in_sync';
yield attachment.saveTx(); yield attachment.saveTx();
var local = Zotero.Sync.Storage.Local; var local = Zotero.Sync.Storage.Local;
yield local.resetModeSyncStates() yield local.resetAllSyncStates()
assert.strictEqual(attachment.attachmentSyncState, local.SYNC_STATE_TO_UPLOAD); assert.strictEqual(attachment.attachmentSyncState, local.SYNC_STATE_TO_UPLOAD);
var state = yield Zotero.DB.valueQueryAsync( var state = yield Zotero.DB.valueQueryAsync(
"SELECT syncState FROM itemAttachments WHERE itemID=?", attachment.id "SELECT syncState FROM itemAttachments WHERE itemID=?", attachment.id