From bcbb97bf02564d635fb0ab47168e3927276629da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=B3=E3=83=A1=E3=83=A9?= <39674991+vynmera@users.noreply.github.com> Date: Thu, 14 Jun 2018 00:44:46 +0200 Subject: [PATCH] [FIX] Some typos in the error message names (#11136) Some places were returning `error-action-now-allowed` instead of `error-action-not-allowed`, which is all a bit confusing but definitely should not be the case. --- packages/rocketchat-assets/server/assets.js | 6 +++--- .../server/methods/getSupportedLanguages.js | 2 +- .../rocketchat-autotranslate/server/methods/saveSettings.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/rocketchat-assets/server/assets.js b/packages/rocketchat-assets/server/assets.js index 297efb79ea4..9d2892b1586 100644 --- a/packages/rocketchat-assets/server/assets.js +++ b/packages/rocketchat-assets/server/assets.js @@ -396,7 +396,7 @@ Meteor.methods({ const hasPermission = RocketChat.authz.hasPermission(Meteor.userId(), 'manage-assets'); if (!hasPermission) { - throw new Meteor.Error('error-action-now-allowed', 'Managing assets not allowed', { + throw new Meteor.Error('error-action-not-allowed', 'Managing assets not allowed', { method: 'refreshClients', action: 'Managing_assets' }); @@ -414,7 +414,7 @@ Meteor.methods({ const hasPermission = RocketChat.authz.hasPermission(Meteor.userId(), 'manage-assets'); if (!hasPermission) { - throw new Meteor.Error('error-action-now-allowed', 'Managing assets not allowed', { + throw new Meteor.Error('error-action-not-allowed', 'Managing assets not allowed', { method: 'unsetAsset', action: 'Managing_assets' }); @@ -432,7 +432,7 @@ Meteor.methods({ const hasPermission = RocketChat.authz.hasPermission(Meteor.userId(), 'manage-assets'); if (!hasPermission) { - throw new Meteor.Error('error-action-now-allowed', 'Managing assets not allowed', { + throw new Meteor.Error('error-action-not-allowed', 'Managing assets not allowed', { method: 'setAsset', action: 'Managing_assets' }); diff --git a/packages/rocketchat-autotranslate/server/methods/getSupportedLanguages.js b/packages/rocketchat-autotranslate/server/methods/getSupportedLanguages.js index 841a30268f8..e312e6ed51c 100644 --- a/packages/rocketchat-autotranslate/server/methods/getSupportedLanguages.js +++ b/packages/rocketchat-autotranslate/server/methods/getSupportedLanguages.js @@ -1,7 +1,7 @@ Meteor.methods({ 'autoTranslate.getSupportedLanguages'(targetLanguage) { if (!RocketChat.authz.hasPermission(Meteor.userId(), 'auto-translate')) { - throw new Meteor.Error('error-action-now-allowed', 'Auto-Translate is not allowed', { method: 'autoTranslate.saveSettings'}); + throw new Meteor.Error('error-action-not-allowed', 'Auto-Translate is not allowed', { method: 'autoTranslate.saveSettings'}); } return RocketChat.AutoTranslate.getSupportedLanguages(targetLanguage); diff --git a/packages/rocketchat-autotranslate/server/methods/saveSettings.js b/packages/rocketchat-autotranslate/server/methods/saveSettings.js index 1030436bcdd..e9ed6dd6fb5 100644 --- a/packages/rocketchat-autotranslate/server/methods/saveSettings.js +++ b/packages/rocketchat-autotranslate/server/methods/saveSettings.js @@ -5,7 +5,7 @@ Meteor.methods({ } if (!RocketChat.authz.hasPermission(Meteor.userId(), 'auto-translate')) { - throw new Meteor.Error('error-action-now-allowed', 'Auto-Translate is not allowed', { method: 'autoTranslate.saveSettings'}); + throw new Meteor.Error('error-action-not-allowed', 'Auto-Translate is not allowed', { method: 'autoTranslate.saveSettings'}); } check(rid, String);