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

Merge branch 'master' of https://github.com/discourse/discourse

This commit is contained in:
Jeff Atwood 2016-12-16 00:39:00 -08:00
parent a2feef0847 e3213f127d
commit e26d6227a4
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/group-membership-button.js.es6
View File

@ -39,7 +39,7 @@ export default Ember.Component.extend({
const groupName = this.get('model.name'); const groupName = this.get('model.name');
const title = I18n.t('groups.request_membership_pm.title'); const title = I18n.t('groups.request_membership_pm.title');
const body = I18n.t('groups.request_membership_pm.body', { groupName }); const body = I18n.t('groups.request_membership_pm.body', { groupName });
this.transitionToRoute(`/new-message?groupname=${groupName}&title=${title}&body=${body}`); this.sendAction("createNewMessageViaParams", groupName, title, body);
} }
} }
}); });

3
app/assets/javascripts/discourse/templates/group-index.hbs
View File

@ -1,5 +1,6 @@
{{#if model.members}} {{#if model.members}}
{{group-membership-button model=model}} {{group-membership-button model=model
createNewMessageViaParams='createNewMessageViaParams'}}
{{#load-more selector=".group-members tr" action="loadMore"}} {{#load-more selector=".group-members tr" action="loadMore"}}
<table class='group-members'> <table class='group-members'>

2
app/assets/javascripts/discourse/templates/groups.hbs
View File

@ -44,7 +44,7 @@
<td class="groups-user-count">{{group.user_count}}</td> <td class="groups-user-count">{{group.user_count}}</td>
<td> <td>
{{#group-membership-button model=group}} {{#group-membership-button model=group createNewMessageViaParams='createNewMessageViaParams'}}
{{d-button icon="ban" {{d-button icon="ban"
label=(if group.automatic 'groups.automatic_group' 'groups.closed_group') label=(if group.automatic 'groups.automatic_group' 'groups.closed_group')
disabled=true}} disabled=true}}

2
config/locales/client.en.yml
View File

@ -401,7 +401,7 @@ en:
delete_member_confirm: "Remove '%{username}' from the '%{group}' group?" delete_member_confirm: "Remove '%{username}' from the '%{group}' group?"
request_membership_pm: request_membership_pm:
title: "Membership Request" title: "Membership Request"
body: "I would like to request membership in @%{groupName}." body: "I would like to apply for membership in @%{groupName}."
name_placeholder: "Group name, no spaces, same as username rule" name_placeholder: "Group name, no spaces, same as username rule"
public: "Allow users to join/leave the group freely (Requires group to be visible)" public: "Allow users to join/leave the group freely (Requires group to be visible)"
empty: empty: