Merge pull request #1830 from rgarmsen2295/plt-1599
PLT-1599 Help text in invite member modal now reflects the default channel name
Этот коммит содержится в:
@@ -8,6 +8,7 @@ import * as Client from '../utils/client.jsx';
|
|||||||
import * as EventHelpers from '../dispatcher/event_helpers.jsx';
|
import * as EventHelpers from '../dispatcher/event_helpers.jsx';
|
||||||
import ModalStore from '../stores/modal_store.jsx';
|
import ModalStore from '../stores/modal_store.jsx';
|
||||||
import UserStore from '../stores/user_store.jsx';
|
import UserStore from '../stores/user_store.jsx';
|
||||||
|
import ChannelStore from '../stores/channel_store.jsx';
|
||||||
import TeamStore from '../stores/team_store.jsx';
|
import TeamStore from '../stores/team_store.jsx';
|
||||||
import ConfirmModal from './confirm_modal.jsx';
|
import ConfirmModal from './confirm_modal.jsx';
|
||||||
|
|
||||||
@@ -304,6 +305,11 @@ export default class InviteMemberModal extends React.Component {
|
|||||||
var content = null;
|
var content = null;
|
||||||
var sendButton = null;
|
var sendButton = null;
|
||||||
|
|
||||||
|
var defaultChannelName = '';
|
||||||
|
if (ChannelStore.getByName(Constants.DEFAULT_CHANNEL)) {
|
||||||
|
defaultChannelName = ChannelStore.getByName(Constants.DEFAULT_CHANNEL).display_name;
|
||||||
|
}
|
||||||
|
|
||||||
if (this.state.emailEnabled && this.state.userCreationEnabled) {
|
if (this.state.emailEnabled && this.state.userCreationEnabled) {
|
||||||
content = (
|
content = (
|
||||||
<div>
|
<div>
|
||||||
@@ -312,10 +318,10 @@ export default class InviteMemberModal extends React.Component {
|
|||||||
type='button'
|
type='button'
|
||||||
className='btn btn-default'
|
className='btn btn-default'
|
||||||
onClick={this.addInviteFields}
|
onClick={this.addInviteFields}
|
||||||
>Add another</button>
|
>{'Add another'}</button>
|
||||||
<br/>
|
<br/>
|
||||||
<br/>
|
<br/>
|
||||||
<span>People invited automatically join Town Square channel.</span>
|
<span>{'People invited automatically join the '}<strong>{defaultChannelName}</strong>{' channel.'}</span>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user