Fixed review comments

mattermost · Feb 9, 2019 · 842fba4 · 842fba4
1 parent 53deacf
commit 842fba4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/components/admin_console/permission_schemes_settings/permission_schemes_settings.jsx b/components/admin_console/permission_schemes_settings/permission_schemes_settings.jsx
@@ -310,8 +310,6 @@ t('admin.permissions.permission.list_users_without_team.description');
 t('admin.permissions.permission.list_users_without_team.name');
 t('admin.permissions.permission.manage_channel_roles.description');
 t('admin.permissions.permission.manage_channel_roles.name');
-t('admin.permissions.permission.manage_emojis.description');
-t('admin.permissions.permission.manage_emojis.name');
 t('admin.permissions.permission.create_emojis.description');
 t('admin.permissions.permission.create_emojis.name');
 t('admin.permissions.permission.delete_emojis.description');
@@ -340,8 +338,6 @@ t('admin.permissions.permission.manage_team.description');
 t('admin.permissions.permission.manage_team.name');
 t('admin.permissions.permission.manage_team_roles.description');
 t('admin.permissions.permission.manage_team_roles.name');
-t('admin.permissions.permission.manage_webhooks.description');
-t('admin.permissions.permission.manage_webhooks.name');
 t('admin.permissions.permission.manage_incoming_webhooks.description');
 t('admin.permissions.permission.manage_incoming_webhooks.name');
 t('admin.permissions.permission.manage_outgoing_webhooks.description');

diff --git a/components/integrations/installed_incoming_webhooks/index.js b/components/integrations/installed_incoming_webhooks/index.js
@@ -19,7 +19,7 @@ import InstalledIncomingWebhooks from './installed_incoming_webhooks.jsx';
 function mapStateToProps(state) {
  const config = getConfig(state);
  const teamId = getCurrentTeamId(state);
- const canManageOthersWebhooks = haveITeamPermission(state, {team: teamId, permission: Permissions.MANAGE_INCOMING_OTHERS_WEBHOOKS});
+ const canManageOthersWebhooks = haveITeamPermission(state, {team: teamId, permission: Permissions.MANAGE_OTHERS_INCOMING_WEBHOOKS});
  const incomingHooks = getIncomingHooks(state);
  const incomingWebhooks = Object.keys(incomingHooks).
  map((key) => incomingHooks[key]).

diff --git a/components/integrations/installed_outgoing_webhooks/index.js b/components/integrations/installed_outgoing_webhooks/index.js
@@ -18,7 +18,7 @@ import InstalledOutgoingWebhook from './installed_outgoing_webhooks.jsx';
 function mapStateToProps(state) {
  const config = getConfig(state);
  const teamId = getCurrentTeamId(state);
- const canManageOthersWebhooks = haveITeamPermission(state, {team: teamId, permission: Permissions.MANAGE_OUTGOING_OTHERS_WEBHOOKS});
+ const canManageOthersWebhooks = haveITeamPermission(state, {team: teamId, permission: Permissions.MANAGE_OTHERS_OUTGOING_WEBHOOKS});
  const outgoingHooks = getOutgoingHooks(state);
  const outgoingWebhooks = Object.keys(outgoingHooks).
  map((key) => outgoingHooks[key]).

diff --git a/utils/constants.jsx b/utils/constants.jsx
@@ -488,9 +488,9 @@ export const PermissionsScope = {
  [Permissions.UPLOAD_FILE]: 'channel_scope',
  [Permissions.GET_PUBLIC_LINK]: 'system_scope',
  [Permissions.MANAGE_INCOMING_WEBHOOKS]: 'team_scope',
- [Permissions.MANAGE_INCOMING_OTHERS_WEBHOOKS]: 'team_scope',
+ [Permissions.MANAGE_OTHERS_INCOMING_WEBHOOKS]: 'team_scope',
  [Permissions.MANAGE_OUTGOING_WEBHOOKS]: 'team_scope',
- [Permissions.MANAGE_OUTGOING_OTHERS_WEBHOOKS]: 'team_scope',
+ [Permissions.MANAGE_OTHERS_OUTGOING_WEBHOOKS]: 'team_scope',
  [Permissions.MANAGE_OAUTH]: 'system_scope',
  [Permissions.MANAGE_SYSTEM_WIDE_OAUTH]: 'system_scope',
  [Permissions.CREATE_POST]: 'channel_scope',