From e9a3f9b0e0e3d20e728cab5d140114969774e15c Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 9 Feb 2018 02:35:15 -0500 Subject: [PATCH] =?UTF-8?q?Show=20"More=20Information=E2=80=A6"=20button?= =?UTF-8?q?=20on=20WebDAV=20SSL=20cert=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Though the button takes you to to https://www.zotero.org/support/kb/ssl_certificate_error rather than https://www.zotero.org/support/kb/incomplete_cert_chain, since the error comes from Zotero.HTTP.) --- chrome/content/zotero/xpcom/storage/webdav.js | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/chrome/content/zotero/xpcom/storage/webdav.js b/chrome/content/zotero/xpcom/storage/webdav.js index be5409f104..a0e1114c5e 100644 --- a/chrome/content/zotero/xpcom/storage/webdav.js +++ b/chrome/content/zotero/xpcom/storage/webdav.js @@ -866,7 +866,7 @@ Zotero.Sync.Storage.Mode.WebDAV.prototype = { break; case "NONEXISTENT_FILE_NOT_MISSING": - var errorTitle = Zotero.getString('sync.storage.error.webdav.serverConfig.title'); + errorTitle = Zotero.getString('sync.storage.error.webdav.serverConfig.title'); errorMsg = Zotero.getString('sync.storage.error.webdav.nonexistentFileNotMissing'); break; @@ -877,18 +877,25 @@ Zotero.Sync.Storage.Mode.WebDAV.prototype = { } } - // TEMP - if (!errorMsg) { - errorMsg = err; + var e; + if (errorMsg) { + e = { + message: errorMsg, + // Prevent Report Errors button for known errors + dialogButtonText: null + }; + Zotero.logError(errorMsg); + } + else { + e = err; + Zotero.logError(err); } - - Zotero.logError(errorMsg); if (!skipSuccessMessage) { if (!errorTitle) { - var errorTitle = Zotero.getString("general.error"); + errorTitle = Zotero.getString("general.error"); } - promptService.alert(window, errorTitle, errorMsg); + Zotero.Utilities.Internal.errorPrompt(errorTitle, e); } return false; }),