diff --git a/dev/Settings/User/Filters.js b/dev/Settings/User/Filters.js index 3941cbddb..c87425fea 100644 --- a/dev/Settings/User/Filters.js +++ b/dev/Settings/User/Filters.js @@ -82,8 +82,8 @@ class FiltersUserSettings { this.scripts.remove(script); delegateRunOnDestroy(script); } else { - this.saveError(true); - this.saveErrorText((data && data.ErrorCode) + this.serverError(true); + this.serverErrorDesc((data && data.ErrorCode) ? (data.ErrorMessageAdditional || getNotification(data.ErrorCode)) : getNotification(Notification.CantActivateFiltersScript) ); @@ -101,8 +101,8 @@ class FiltersUserSettings { if (StorageResultType.Success === result && data && data.Result) { this.scripts().forEach(script => script.active(script.name() === name)); } else { - this.saveError(true); - this.saveErrorText((data && data.ErrorCode) + this.serverError(true); + this.serverErrorDesc((data && data.ErrorCode) ? (data.ErrorMessageAdditional || getNotification(data.ErrorCode)) : getNotification(Notification.CantActivateFiltersScript) ); diff --git a/dev/View/Popup/SieveScript.js b/dev/View/Popup/SieveScript.js index a4dd37b2a..cc11da8c1 100644 --- a/dev/View/Popup/SieveScript.js +++ b/dev/View/Popup/SieveScript.js @@ -36,8 +36,9 @@ class SieveScriptPopupView extends AbstractViewNext { // @command() saveScriptCommand() { - let script = this.script(); - if (!this.saving/* && script.hasChanges()*/) { + let self = this, + script = self.script(); + if (!self.saving/* && script.hasChanges()*/) { if (!script.verify()) { return false; } @@ -47,21 +48,21 @@ class SieveScriptPopupView extends AbstractViewNext { return false; } - this.saving = true; - this.saveError(false); + self.saving = true; + self.saveError(false); // script.body(script.filtersToRaw()); Remote.filtersScriptSave( (result, data) => { - this.saving = false; + self.saving = false; if (StorageResultType.Success === result && data && data.Result) { script.exists(true); script.hasChanges(false); SieveStore.scripts.push(script); } else { - this.saveError(true); - this.saveErrorText((data && data.ErrorCode) + self.saveError(true); + self.saveErrorText((data && data.ErrorCode) ? (data.ErrorMessageAdditional || getNotification(data.ErrorCode)) : getNotification(Notification.CantSaveFilters) ); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters.php index 379a9b280..10f575a2c 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters.php @@ -51,7 +51,7 @@ class Filters extends \RainLoop\Providers\AbstractProvider } catch (\Throwable $oException) { - static::handleException($oException. \RainLoop\Notifications::CantSaveFilters); + static::handleException($oException, \RainLoop\Notifications::CantSaveFilters); } } @@ -65,7 +65,7 @@ class Filters extends \RainLoop\Providers\AbstractProvider } catch (\Throwable $oException) { - static::handleException($oException. \RainLoop\Notifications::CantActivateFiltersScript); + static::handleException($oException, \RainLoop\Notifications::CantActivateFiltersScript); } } @@ -79,7 +79,7 @@ class Filters extends \RainLoop\Providers\AbstractProvider } catch (\Throwable $oException) { - static::handleException($oException. \RainLoop\Notifications::CantDeleteFiltersScript); + static::handleException($oException, \RainLoop\Notifications::CantDeleteFiltersScript); } }