From 55a97b215d8e3127f931cc67670d520907120ac0 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Wed, 10 Feb 2016 14:53:45 -0800 Subject: PLT-1956 --- web/react/components/user_settings/user_settings_modal.jsx | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'web/react/components') diff --git a/web/react/components/user_settings/user_settings_modal.jsx b/web/react/components/user_settings/user_settings_modal.jsx index 7e911f09a..5442f7ac4 100644 --- a/web/react/components/user_settings/user_settings_modal.jsx +++ b/web/react/components/user_settings/user_settings_modal.jsx @@ -234,7 +234,10 @@ class UserSettingsModal extends React.Component { render() { const {formatMessage} = this.props.intl; + var currentUser = UserStore.getCurrentUser(); + var isAdmin = Utils.isAdmin(currentUser.roles); var tabs = []; + tabs.push({name: 'general', uiName: formatMessage(holders.general), icon: 'glyphicon glyphicon-cog'}); tabs.push({name: 'security', uiName: formatMessage(holders.security), icon: 'glyphicon glyphicon-lock'}); tabs.push({name: 'notifications', uiName: formatMessage(holders.notifications), icon: 'glyphicon glyphicon-exclamation-sign'}); @@ -243,8 +246,17 @@ class UserSettingsModal extends React.Component { } if (global.window.mm_config.EnableIncomingWebhooks === 'true' || global.window.mm_config.EnableOutgoingWebhooks === 'true' || global.window.mm_config.EnableCommands === 'true') { - tabs.push({name: 'integrations', uiName: formatMessage(holders.integrations), icon: 'glyphicon glyphicon-transfer'}); + var show = global.window.mm_config.EnableOnlyAdminIntegrations !== 'true'; + + if (global.window.mm_config.EnableOnlyAdminIntegrations === 'true' && isAdmin) { + show = true; + } + + if (show) { + tabs.push({name: 'integrations', uiName: formatMessage(holders.integrations), icon: 'glyphicon glyphicon-transfer'}); + } } + tabs.push({name: 'display', uiName: formatMessage(holders.display), icon: 'glyphicon glyphicon-eye-open'}); tabs.push({name: 'advanced', uiName: formatMessage(holders.advanced), icon: 'glyphicon glyphicon-list-alt'}); -- cgit v1.2.3-1-g7c22 From 8a7535d7fe11a7c8aee08dface4b51d454b7f4e4 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Thu, 11 Feb 2016 09:58:04 -0800 Subject: Fixing socket store loc --- web/react/components/channel_loader.jsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'web/react/components') diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx index 174c8c4e1..2aa28d5c4 100644 --- a/web/react/components/channel_loader.jsx +++ b/web/react/components/channel_loader.jsx @@ -20,31 +20,31 @@ import {intlShape, injectIntl, defineMessages} from 'mm-intl'; const holders = defineMessages({ socketError: { id: 'channel_loader.socketError', - defaultMessage: 'Please check connection, Mattermost unreachable. If issue persists, ask administrator to check WebSocket port.' + defaultMessage: SocketStore.getDefaultTranslations().socketError }, someone: { id: 'channel_loader.someone', - defaultMessage: 'Someone' + defaultMessage: SocketStore.getDefaultTranslations().someone }, posted: { id: 'channel_loader.posted', - defaultMessage: 'Posted' + defaultMessage: SocketStore.getDefaultTranslations().posted }, uploadedImage: { id: 'channel_loader.uploadedImage', - defaultMessage: ' uploaded an image' + defaultMessage: SocketStore.getDefaultTranslations().uploadedImage }, uploadedFile: { id: 'channel_loader.uploadedFile', - defaultMessage: ' uploaded a file' + defaultMessage: SocketStore.getDefaultTranslations().uploadedFile }, something: { id: 'channel_loader.something', - defaultMessage: ' did something new' + defaultMessage: SocketStore.getDefaultTranslations().something }, wrote: { id: 'channel_loader.wrote', - defaultMessage: ' wrote: ' + defaultMessage: SocketStore.getDefaultTranslations().wrote } }); -- cgit v1.2.3-1-g7c22 From 28703f29d43aaf5a81297534c5b392432f114460 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Thu, 11 Feb 2016 15:02:27 -0300 Subject: Fixing intl console error on Outgoing webhook edit --- web/react/components/user_settings/manage_outgoing_hooks.jsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'web/react/components') diff --git a/web/react/components/user_settings/manage_outgoing_hooks.jsx b/web/react/components/user_settings/manage_outgoing_hooks.jsx index 3f88e9f41..44aab486e 100644 --- a/web/react/components/user_settings/manage_outgoing_hooks.jsx +++ b/web/react/components/user_settings/manage_outgoing_hooks.jsx @@ -18,6 +18,10 @@ const holders = defineMessages({ callbackHolder: { id: 'user.settings.hooks_out.callbackHolder', defaultMessage: 'Each URL must start with http:// or https://' + }, + select: { + id: 'user.settings.hooks_out.select', + defaultMessage: '--- Select a channel ---' } }); @@ -153,10 +157,7 @@ class ManageOutgoingHooks extends React.Component { key='select-channel' value='' > - + {this.props.intl.formatMessage(holders.select)} ); -- cgit v1.2.3-1-g7c22 From b35146e9b81fa6fd8934fe590c2a2854e6a5b1d5 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Thu, 11 Feb 2016 13:47:32 -0500 Subject: Fix localization error for team invites --- web/react/components/team_signup_email_item.jsx | 2 +- web/react/components/team_signup_send_invites_page.jsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'web/react/components') diff --git a/web/react/components/team_signup_email_item.jsx b/web/react/components/team_signup_email_item.jsx index feb70dc71..790ec2e5d 100644 --- a/web/react/components/team_signup_email_item.jsx +++ b/web/react/components/team_signup_email_item.jsx @@ -83,4 +83,4 @@ TeamSignupEmailItem.propTypes = { email: React.PropTypes.string }; -export default injectIntl(TeamSignupEmailItem); \ No newline at end of file +export default injectIntl(TeamSignupEmailItem, {withRef: true}); diff --git a/web/react/components/team_signup_send_invites_page.jsx b/web/react/components/team_signup_send_invites_page.jsx index 46a6bc68e..343db13e8 100644 --- a/web/react/components/team_signup_send_invites_page.jsx +++ b/web/react/components/team_signup_send_invites_page.jsx @@ -33,8 +33,8 @@ export default class TeamSignupSendInvitesPage extends React.Component { var emails = []; for (var i = 0; i < this.props.state.invites.length; i++) { - if (this.refs['email_' + i].validate(this.props.state.team.email)) { - emails.push(this.refs['email_' + i].getValue()); + if (this.refs['email_' + i].getWrappedInstance().validate(this.props.state.team.email)) { + emails.push(this.refs['email_' + i].getWrappedInstance().getValue()); } else { valid = false; } -- cgit v1.2.3-1-g7c22 From b0252c9aa91ff9382600cd0cb66b69530f080941 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Thu, 11 Feb 2016 16:29:52 -0300 Subject: Fix duplicate am/pm on last password update --- web/react/components/user_settings/user_settings_security.jsx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'web/react/components') diff --git a/web/react/components/user_settings/user_settings_security.jsx b/web/react/components/user_settings/user_settings_security.jsx index 5693047c2..166f5ec45 100644 --- a/web/react/components/user_settings/user_settings_security.jsx +++ b/web/react/components/user_settings/user_settings_security.jsx @@ -11,6 +11,7 @@ import TeamStore from '../../stores/team_store.jsx'; import * as Client from '../../utils/client.jsx'; import * as AsyncClient from '../../utils/async_client.jsx'; +import * as Utils from '../../utils/utils.jsx'; import Constants from '../../utils/constants.jsx'; import {intlShape, injectIntl, defineMessages, FormattedMessage} from 'mm-intl'; @@ -216,15 +217,12 @@ class SecurityTab extends React.Component { var describe; var d = new Date(this.props.user.last_password_update); - var timeOfDay = ' am'; - if (d.getHours() >= 12) { - timeOfDay = ' pm'; - } const locale = global.window.mm_locale; + const hours12 = !Utils.useMilitaryTime(); describe = formatMessage(holders.lastUpdated, { date: d.toLocaleDateString(locale, {month: 'short', day: '2-digit', year: 'numeric'}), - time: d.toLocaleTimeString(locale, {hours12: true, hour: '2-digit', minute: '2-digit'}) + timeOfDay + time: d.toLocaleTimeString(locale, {hour12: hours12, hour: '2-digit', minute: '2-digit'}) }); updateSectionStatus = function updateSection() { -- cgit v1.2.3-1-g7c22 From ae8c67365de589238066237c667f5132ced13087 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Thu, 11 Feb 2016 16:46:46 -0300 Subject: eslint no-shadow resolved --- web/react/components/user_settings/user_settings_security.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/react/components') diff --git a/web/react/components/user_settings/user_settings_security.jsx b/web/react/components/user_settings/user_settings_security.jsx index 166f5ec45..53d79906f 100644 --- a/web/react/components/user_settings/user_settings_security.jsx +++ b/web/react/components/user_settings/user_settings_security.jsx @@ -219,7 +219,7 @@ class SecurityTab extends React.Component { var d = new Date(this.props.user.last_password_update); const locale = global.window.mm_locale; - const hours12 = !Utils.useMilitaryTime(); + const hours12 = !Utils.isMilitaryTime(); describe = formatMessage(holders.lastUpdated, { date: d.toLocaleDateString(locale, {month: 'short', day: '2-digit', year: 'numeric'}), time: d.toLocaleTimeString(locale, {hour12: hours12, hour: '2-digit', minute: '2-digit'}) -- cgit v1.2.3-1-g7c22 From 4419fe140dabd457cddf5f481c5b7c2aca152133 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Thu, 11 Feb 2016 13:24:56 -0800 Subject: Fixing so the loc tool can use these --- web/react/components/channel_loader.jsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'web/react/components') diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx index 2aa28d5c4..174c8c4e1 100644 --- a/web/react/components/channel_loader.jsx +++ b/web/react/components/channel_loader.jsx @@ -20,31 +20,31 @@ import {intlShape, injectIntl, defineMessages} from 'mm-intl'; const holders = defineMessages({ socketError: { id: 'channel_loader.socketError', - defaultMessage: SocketStore.getDefaultTranslations().socketError + defaultMessage: 'Please check connection, Mattermost unreachable. If issue persists, ask administrator to check WebSocket port.' }, someone: { id: 'channel_loader.someone', - defaultMessage: SocketStore.getDefaultTranslations().someone + defaultMessage: 'Someone' }, posted: { id: 'channel_loader.posted', - defaultMessage: SocketStore.getDefaultTranslations().posted + defaultMessage: 'Posted' }, uploadedImage: { id: 'channel_loader.uploadedImage', - defaultMessage: SocketStore.getDefaultTranslations().uploadedImage + defaultMessage: ' uploaded an image' }, uploadedFile: { id: 'channel_loader.uploadedFile', - defaultMessage: SocketStore.getDefaultTranslations().uploadedFile + defaultMessage: ' uploaded a file' }, something: { id: 'channel_loader.something', - defaultMessage: SocketStore.getDefaultTranslations().something + defaultMessage: ' did something new' }, wrote: { id: 'channel_loader.wrote', - defaultMessage: SocketStore.getDefaultTranslations().wrote + defaultMessage: ' wrote: ' } }); -- cgit v1.2.3-1-g7c22