1 files changed, 31 insertions, 20 deletions

diff --git a/webapp/components/admin_console/custom_emoji_settings.jsx b/webapp/components/admin_console/custom_emoji_settings.jsx
index 332c7b216..738afa3cd 100644
--- a/webapp/components/admin_console/custom_emoji_settings.jsx
+++ b/webapp/components/admin_console/custom_emoji_settings.jsx
@@ -27,7 +27,10 @@ export default class CustomEmojiSettings extends AdminSettings {
 
     getConfigFromState(config) {
         config.ServiceSettings.EnableCustomEmoji = this.state.enableCustomEmoji;
-        config.ServiceSettings.RestrictCustomEmojiCreation = this.state.restrictCustomEmojiCreation;
+
+        if (global.window.mm_license.IsLicensed === 'true') {
+            config.ServiceSettings.RestrictCustomEmojiCreation = this.state.restrictCustomEmojiCreation;
+        }
 
         return config;
     }
@@ -44,29 +47,14 @@ export default class CustomEmojiSettings extends AdminSettings {
     }
 
     renderSettings() {
-        return (
-            <SettingsGroup>
-                <BooleanSetting
-                    id='enableCustomEmoji'
-                    label={
-                        <FormattedMessage
-                            id='admin.customization.enableCustomEmojiTitle'
-                            defaultMessage='Enable Custom Emoji:'
-                        />
-                    }
-                    helpText={
-                        <FormattedMessage
-                            id='admin.customization.enableCustomEmojiDesc'
-                            defaultMessage='Enable users to create custom emoji for use in chat messages.'
-                        />
-                    }
-                    value={this.state.enableCustomEmoji}
-                    onChange={this.handleChange}
-                />
+        let restrictSetting = null;
+        if (global.window.mm_license.IsLicensed === 'true') {
+            restrictSetting = (
                 <DropdownSetting
                     id='restrictCustomEmojiCreation'
                     values={[
                         {value: 'all', text: Utils.localizeMessage('admin.customization.restrictCustomEmojiCreationAll', 'Allow everyone to create custom emoji')},
+                        {value: 'admin', text: Utils.localizeMessage('admin.customization.restrictCustomEmojiCreationAdmin', 'Allow system and team admins to create custom emoji')},
                         {value: 'system_admin', text: Utils.localizeMessage('admin.customization.restrictCustomEmojiCreationSystemAdmin', 'Only allow system admins to create custom emoji')}
                     ]}
                     label={
@@ -85,6 +73,29 @@ export default class CustomEmojiSettings extends AdminSettings {
                     onChange={this.handleChange}
                     disabled={!this.state.enableCustomEmoji}
                 />
+            );
+        }
+
+        return (
+            <SettingsGroup>
+                <BooleanSetting
+                    id='enableCustomEmoji'
+                    label={
+                        <FormattedMessage
+                            id='admin.customization.enableCustomEmojiTitle'
+                            defaultMessage='Enable Custom Emoji:'
+                        />
+                    }
+                    helpText={
+                        <FormattedMessage
+                            id='admin.customization.enableCustomEmojiDesc'
+                            defaultMessage='Enable users to create custom emoji for use in chat messages.'
+                        />
+                    }
+                    value={this.state.enableCustomEmoji}
+                    onChange={this.handleChange}
+                />
+                {restrictSetting}
             </SettingsGroup>
         );
     }