mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

PLT-2981 Disabled Push Notifications section in Settings if disabled by admin (#3225)

Просмотр исходного кода 
* Added push notifications disabled message to settings

* Update user_settings_notifications.jsx
Этот коммит содержится в:
David Lu
2016-06-04 08:23:44 -07:00
коммит произвёл Joram Wilander
родитель 06b1646798
Коммит 6f0a7e4b13
2 изменённых файлов: 87 добавлений и 63 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

148
webapp/components/user_settings/user_settings_notifications.jsx
Просмотреть файл

@@ -263,71 +263,89 @@ class NotificationsTab extends React.Component {
} }
let inputs = []; let inputs = [];
let extraInfo = null;
let submit = null;
inputs.push( if (global.window.mm_config.SendPushNotifications === 'true') {
<div key='userNotificationLevelOption'> inputs.push(
<div className='radio'> <div key='userNotificationLevelOption'>
<label> <div className='radio'>
<input <label>
type='radio' <input
name='pushNotificationLevel' type='radio'
checked={notifyActive[0]} name='pushNotificationLevel'
onChange={this.handlePushRadio.bind(this, 'all')} checked={notifyActive[0]}
/> onChange={this.handlePushRadio.bind(this, 'all')}
<FormattedMessage />
id='user.settings.push_notification.allActivity' <FormattedMessage
defaultMessage='For all activity' id='user.settings.push_notification.allActivity'
/> defaultMessage='For all activity'
</label> />
<br/> </label>
<br/>
</div>
<div className='radio'>
<label>
<input
type='radio'
name='pushNotificationLevel'
checked={notifyActive[1]}
onChange={this.handlePushRadio.bind(this, 'mention')}
/>
<FormattedMessage
id='user.settings.push_notification.onlyMentions'
defaultMessage='For mentions and direct messages'
/>
</label>
<br/>
</div>
<div className='radio'>
<label>
<input
type='radio'
name='pushNotificationLevel'
checked={notifyActive[2]}
onChange={this.handlePushRadio.bind(this, 'none')}
/>
<FormattedMessage
id='user.settings.push_notification.off'
defaultMessage='Off'
/>
</label>
</div>
</div> </div>
<div className='radio'> );
<label>
<input
type='radio'
name='pushNotificationLevel'
checked={notifyActive[1]}
onChange={this.handlePushRadio.bind(this, 'mention')}
/>
<FormattedMessage
id='user.settings.push_notifications.onlyMentions'
defaultMessage='For mentions and direct messages'
/>
</label>
<br/>
</div>
<div className='radio'>
<label>
<input
type='radio'
name='pushNotificationLevel'
checked={notifyActive[2]}
onChange={this.handlePushRadio.bind(this, 'none')}
/>
<FormattedMessage
id='user.settings.push_notifications.off'
defaultMessage='Off'
/>
</label>
</div>
</div>
);
const extraInfo = ( extraInfo = (
<span> <span>
<FormattedMessage <FormattedMessage
id='user.settings.push_notifications.info' id='user.settings.push_notification.info'
defaultMessage='Notification alerts are pushed to your mobile device when there is activity in Mattermost.' defaultMessage='Notification alerts are pushed to your mobile device when there is activity in Mattermost.'
/> />
</span> </span>
); );
submit = this.handleSubmit();
} else {
inputs.push(
<div
key='oauthEmailInfo'
className='form-group'
>
<FormattedMessage
id='user.settings.push_notification.disabled_long'
defaultMessage='Push notifications for mobile devices have been disabled by your System Administrator.'
/>
</div>
);
}
return ( return (
<SettingItemMax <SettingItemMax
title={Utils.localizeMessage('user.settings.notifications.push', 'Mobile push notifications')} title={Utils.localizeMessage('user.settings.notifications.push', 'Mobile push notifications')}
extraInfo={extraInfo} extraInfo={extraInfo}
inputs={inputs} inputs={inputs}
submit={this.handleSubmit} submit={submit}
server_error={this.state.serverError} server_error={this.state.serverError}
updateSection={this.handleCancel} updateSection={this.handleCancel}
/> />
@@ -345,14 +363,21 @@ class NotificationsTab extends React.Component {
} else if (this.state.notifyPushLevel === 'none') { } else if (this.state.notifyPushLevel === 'none') {
describe = ( describe = (
<FormattedMessage <FormattedMessage
id='user.settings.push_notifications.off' id='user.settings.push_notification.off'
defaultMessage='Off' defaultMessage='Off'
/> />
); );
} else if (global.window.mm_config.SendPushNotifications === 'false') {
describe = (
<FormattedMessage
id='user.settings.push_notification.disabled'
defaultMessage='Disabled by system administrator'
/>
);
} else { } else {
describe = ( describe = (
<FormattedMessage <FormattedMessage
id='user.settings.push_notifications.onlyMentions' id='user.settings.push_notification.onlyMentions'
defaultMessage='For mentions and direct messages' defaultMessage='For mentions and direct messages'
/> />
); );
@@ -364,7 +389,7 @@ class NotificationsTab extends React.Component {
return ( return (
<SettingItemMin <SettingItemMin
title={Utils.localizeMessage('user.settings.notifications.push', 'Mobile push notifications')} title={Utils.localizeMessage('user.settings.notification.push', 'Mobile push notifications')}
describe={describe} describe={describe}
updateSection={handleUpdateDesktopSection} updateSection={handleUpdateDesktopSection}
/> />
@@ -911,10 +936,7 @@ class NotificationsTab extends React.Component {
); );
} }
let pushNotificationSection; const pushNotificationSection = this.createPushNotificationSection();
if (global.window.mm_config.SendPushNotifications === 'true') {
pushNotificationSection = this.createPushNotificationSection();
}
return ( return (
<div> <div>

2
webapp/i18n/en.json
Просмотреть файл

@@ -1393,6 +1393,8 @@
"user.settings.push_notification.info": "Notification alerts are pushed to your mobile device when there is activity in Mattermost.", "user.settings.push_notification.info": "Notification alerts are pushed to your mobile device when there is activity in Mattermost.",
"user.settings.push_notification.off": "Off", "user.settings.push_notification.off": "Off",
"user.settings.push_notification.onlyMentions": "For mentions and direct messages", "user.settings.push_notification.onlyMentions": "For mentions and direct messages",
"user.settings.push_notification.disabled": "Disabled by system administrator",
"user.settings.push_notification.disabled_long": "Push notifications for mobile devices have been disabled by your System Administrator.",
"user.settings.security.close": "Close", "user.settings.security.close": "Close",
"user.settings.security.currentPassword": "Current Password", "user.settings.security.currentPassword": "Current Password",
"user.settings.security.currentPasswordError": "Please enter your current password", "user.settings.security.currentPasswordError": "Please enter your current password",