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

Properly test whether file syncing is enabled for a library

Browse source
This commit is contained in:
Dan Stillman 2016-05-15 04:21:51 -04:00
parent a8ea8656d2
commit 427234917d
3 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/xpcom/storage/storageEngine.js
View file

@ -77,7 +77,7 @@ Zotero.Sync.Storage.Engine = function (options) {
Zotero.Sync.Storage.Engine.prototype.start = Zotero.Promise.coroutine(function* () {
var libraryID = this.libraryID;
if (!Zotero.Prefs.get("sync.storage.enabled")) {
if (!Zotero.Sync.Storage.Local.getEnabledForLibrary(libraryID)) {
Zotero.debug("File sync is not enabled for " + this.library.name);
return false;
}

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

@ -12,6 +12,24 @@ Zotero.Sync.Storage.Local = {
lastFullFileCheck: {},
uploadCheckFiles: [],
getEnabledForLibrary: function (libraryID) {
var libraryType = Zotero.Libraries.get(libraryID).libraryType;
switch (libraryType) {
case 'user':
case 'publications':
return Zotero.Prefs.get("sync.storage.enabled");
case 'group':
return Zotero.Prefs.get("sync.storage.groups.enabled");
case 'feed':
return false;
default:
throw new Error(`Unexpected library type '${libraryType}'`);
}
},
getClassForLibrary: function (libraryID) {
return Zotero.Sync.Storage.Utilities.getClassForMode(this.getModeForLibrary(libraryID));
},

3
chrome/content/zotero/zoteroPane.js
View file

@ -3936,7 +3936,8 @@ var ZoteroPane = new function()
}
else {
if (!item.isImportedAttachment()
|| !Zotero.Sync.Storage.Local.downloadAsNeeded(item.libraryID)) {
|| (!Zotero.Sync.Storage.Local.getEnabledForLibrary(item.libraryID)
|| !Zotero.Sync.Storage.Local.downloadAsNeeded(item.libraryID))) {
this.showAttachmentNotFoundDialog(itemID, noLocateOnMissing);
return;
}