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

Fix sync error after resetting read-only group

Browse source 
If an item needed to be erased, it would fail with "Cannot edit item in
read-only library", because the deletion didn't skip the edit check.
This commit is contained in:
Dan Stillman 2017-12-02 01:35:23 -05:00
parent 640846961a
commit cdaf73b3d0
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
chrome/content/zotero/xpcom/sync/syncLocal.js
View file

@ -277,7 +277,13 @@ Zotero.Sync.Data.Local = {
} }
} }
if (toDelete.length) { if (toDelete.length) {
yield objectsClass.erase(toDelete, { skipDeleteLog: true }); yield objectsClass.erase(
toDelete,
{
skipEditCheck: true,
skipDeleteLog: true
}
);
} }
// Deleted objects // Deleted objects

4
test/tests/syncLocalTest.js
View file

@ -281,6 +281,10 @@ describe("Zotero.Sync.Data.Local", function() {
var deletedItemKey = deletedItem.key; var deletedItemKey = deletedItem.key;
yield deletedItem.eraseTx(); yield deletedItem.eraseTx();
// Make group read-only
group.editable = false;
yield group.saveTx();
yield Zotero.Sync.Data.Local.resetUnsyncedLibraryData(libraryID); yield Zotero.Sync.Data.Local.resetUnsyncedLibraryData(libraryID);
assert.isNull(Zotero.SyncedSettings.get(group.libraryID, "testSetting")); assert.isNull(Zotero.SyncedSettings.get(group.libraryID, "testSetting"));