Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: incorrect instructions when inviting user to forum

This commit is contained in:
Arpit Jalan 2017-02-03 13:43:39 +05:30
parent 6b8691ecea
commit 67669c00c5
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/assets/javascripts/discourse/controllers/invite.js.es6
View File

@ -68,9 +68,16 @@ export default Ember.Controller.extend(ModalFunctionality, {
return this.get('model') !== this.currentUser; return this.get('model') !== this.currentUser;
}.property('model'), }.property('model'),
@computed('isMessage', 'model.details.can_invite_via_email') @computed('model', 'model.details.can_invite_via_email')
showCopyInviteButton(isMessage, can_invite_via_email) { canInviteViaEmail(model, can_invite_via_email) {
return (can_invite_via_email && !isMessage); return (this.get('model') === this.currentUser) ?
true :
can_invite_via_email;
},
@computed('isMessage', 'canInviteViaEmail')
showCopyInviteButton(isMessage, canInviteViaEmail) {
return (canInviteViaEmail && !isMessage);
}, },
topicId: Ember.computed.alias('model.id'), topicId: Ember.computed.alias('model.id'),
@ -87,10 +94,10 @@ export default Ember.Controller.extend(ModalFunctionality, {
}.property('invitingToTopic'), }.property('invitingToTopic'),
// Show Groups? (add invited user to private group) // Show Groups? (add invited user to private group)
@computed('isAdmin', 'emailOrUsername', 'isPrivateTopic', 'isMessage', 'invitingToTopic', 'model.details.can_invite_via_email') @computed('isAdmin', 'emailOrUsername', 'isPrivateTopic', 'isMessage', 'invitingToTopic', 'canInviteViaEmail')
showGroups(isAdmin, emailOrUsername, isPrivateTopic, isMessage, invitingToTopic, can_invite_via_email) { showGroups(isAdmin, emailOrUsername, isPrivateTopic, isMessage, invitingToTopic, canInviteViaEmail) {
return isAdmin && return isAdmin &&
can_invite_via_email && canInviteViaEmail &&
!isMessage && !isMessage &&
(emailValid(emailOrUsername) || isPrivateTopic || !invitingToTopic); (emailValid(emailOrUsername) || isPrivateTopic || !invitingToTopic);
}, },
@ -101,9 +108,9 @@ export default Ember.Controller.extend(ModalFunctionality, {
}, },
// Instructional text for the modal. // Instructional text for the modal.
@computed('isMessage', 'invitingToTopic', 'emailOrUsername', 'isPrivateTopic', 'isAdmin', 'model.details.can_invite_via_email') @computed('isMessage', 'invitingToTopic', 'emailOrUsername', 'isPrivateTopic', 'isAdmin', 'canInviteViaEmail')
inviteInstructions(isMessage, invitingToTopic, emailOrUsername, isPrivateTopic, isAdmin, can_invite_via_email) { inviteInstructions(isMessage, invitingToTopic, emailOrUsername, isPrivateTopic, isAdmin, canInviteViaEmail) {
if (!can_invite_via_email) { if (!canInviteViaEmail) {
// can't invite via email, only existing users // can't invite via email, only existing users
return I18n.t('topic.invite_reply.sso_enabled'); return I18n.t('topic.invite_reply.sso_enabled');
} else if (isMessage) { } else if (isMessage) {
@ -157,9 +164,9 @@ export default Ember.Controller.extend(ModalFunctionality, {
return this.get('isMessage') ? I18n.t('topic.invite_private.error') : I18n.t('topic.invite_reply.error'); return this.get('isMessage') ? I18n.t('topic.invite_private.error') : I18n.t('topic.invite_reply.error');
}.property('isMessage'), }.property('isMessage'),
@computed('model.details.can_invite_via_email') @computed('canInviteViaEmail')
placeholderKey(can_invite_via_email) { placeholderKey(canInviteViaEmail) {
return (can_invite_via_email) ? return (canInviteViaEmail) ?
'topic.invite_private.email_or_username_placeholder' : 'topic.invite_private.email_or_username_placeholder' :
'topic.invite_reply.username_placeholder'; 'topic.invite_reply.username_placeholder';
}, },