From 1a3f952c56ba080b5eb3913ba579680afb98089f Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Wed, 6 Jul 2016 13:52:28 -0400 Subject: PLT-3518/PLT-3519 Custom emoji followup (#3507) * Fixed emoji list filter when full name or nickname are enabled * Changed custom emoji list to only be visible if the user can create custom emoji --- webapp/components/backstage/components/backstage_sidebar.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'webapp/components/backstage') diff --git a/webapp/components/backstage/components/backstage_sidebar.jsx b/webapp/components/backstage/components/backstage_sidebar.jsx index a17d830b0..ea0849c8a 100644 --- a/webapp/components/backstage/components/backstage_sidebar.jsx +++ b/webapp/components/backstage/components/backstage_sidebar.jsx @@ -4,6 +4,7 @@ import React from 'react'; import TeamStore from 'stores/team_store.jsx'; +import * as Utils from 'utils/utils.jsx'; import BackstageCategory from './backstage_category.jsx'; import BackstageSection from './backstage_section.jsx'; @@ -18,7 +19,7 @@ export default class BackstageSidebar extends React.Component { } renderCustomEmoji() { - if (window.mm_config.EnableCustomEmoji !== 'true') { + if (window.mm_config.EnableCustomEmoji !== 'true' || !Utils.canCreateCustomEmoji(this.props.user)) { return null; } @@ -44,7 +45,7 @@ export default class BackstageSidebar extends React.Component { return null; } - if (window.mm_config.RestrictCustomEmojiCreation !== 'all' && !TeamStore.isTeamAdmin(this.props.user.id, this.props.team.id)) { + if (window.mm_config.EnableOnlyAdminIntegrations !== 'false' && !TeamStore.isTeamAdmin(this.props.user.id, this.props.team.id)) { return null; } -- cgit v1.2.3-1-g7c22