codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-03-22 04:45:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Converted Private Message map to a component

Browse source
This commit is contained in:
Robin Ward 2013-11-15 14:47:20 -05:00
parent 039acd6ead
commit 52048d2d2b
6 changed files with 65 additions and 51 deletions

30
app/assets/javascripts/discourse/components/private_message_map_component.js Normal file
View file

@ -0,0 +1,30 @@
Discourse.DiscoursePrivateMessageMapComponent = Ember.Component.extend({
templateName: 'components/discourse-private-message-map',
tagName: 'section',
classNames: ['information'],
postStream: Em.computed.alias('topic.postStream'),
details: Em.computed.alias('topic.details'),
actions: {
removeAllowedUser: function(user) {
console.log(user);
var self = this;
bootbox.dialog(I18n.t("private_message_info.remove_allowed_user", {name: user.get('username')}), [
{label: I18n.t("no_value"),
'class': 'btn-danger rightg'},
{label: I18n.t("yes_value"),
'class': 'btn-primary',
callback: function() {
self.get('details').removeAllowedUser(user);
}
}
]);
},
showPrivateInvite: function() {
this.sendAction('showPrivateInviteAction');
}
}
});

14
app/assets/javascripts/discourse/controllers/topic_controller.js
View file

@ -222,19 +222,7 @@ Discourse.TopicController = Discourse.ObjectController.extend(Discourse.Selected
});
},
removeAllowedUser: function(username) {
var self = this;
bootbox.dialog(I18n.t("private_message_info.remove_allowed_user", {name: username}), [
{label: I18n.t("no_value"),
'class': 'btn-danger rightg'},
{label: I18n.t("yes_value"),
'class': 'btn-primary',
callback: function() {
self.get('details').removeAllowedUser(username);
}
}
]);
}
},

12
app/assets/javascripts/discourse/models/topic_details.js
View file

@ -34,11 +34,11 @@ Discourse.TopicDetails = Discourse.Model.extend({
notificationReasonText: function() {
var locale_string = "topic.notifications.reasons." + (this.get('notification_level') || 1);
var localeString = "topic.notifications.reasons." + (this.get('notification_level') || 1);
if (typeof this.get('notifications_reason_id') === 'number') {
locale_string += "_" + this.get('notifications_reason_id');
localeString += "_" + this.get('notifications_reason_id');
}
return I18n.t(locale_string, { username: Discourse.User.currentProp('username_lower') });
return I18n.t(localeString, { username: Discourse.User.currentProp('username_lower') });
}.property('notification_level', 'notifications_reason_id'),
@ -51,8 +51,10 @@ Discourse.TopicDetails = Discourse.Model.extend({
});
},
removeAllowedUser: function(username) {
var users = this.get('allowed_users');
removeAllowedUser: function(user) {
var users = this.get('allowed_users'),
username = user.get('username');
Discourse.ajax("/t/" + this.get('topic.id') + "/remove-allowed-user", {
type: 'PUT',
data: { username: username }

26
app/assets/javascripts/discourse/templates/components/discourse-private-message-map.js.handlebars Normal file
View file

@ -0,0 +1,26 @@
<h3><i class='icon icon-envelope'></i> {{i18n private_message_info.title}}</h3>
<div class='participants clearfix'>
{{#groupedEach details.allowed_groups}}
<div class='user group'>
#{{unbound name}}
</div>
{{/groupedEach}}
{{#groupedEach details.allowed_users}}
<div class='user'>
{{#link-to 'user' this}}
{{avatar this imageSize="small"}}
{{/link-to}}
{{#link-to 'user' this}}
{{unbound username}}
{{/link-to}}
{{#if view.details.can_remove_allowed_users}}
<a class='remove-invited' {{action removeAllowedUser this}}><i class="icon-remove"></i></a>
{{/if}}
</div>
{{/groupedEach}}
</div>
{{#if details.can_invite_to}}
<div class='controls'>
<button class='btn' {{action showPrivateInvite}}>{{i18n private_message_info.invite}}</button>
</div>
{{/if}}

26
app/assets/javascripts/discourse/templates/topic_map/private_message.js.handlebars
View file

@ -1,26 +0,0 @@
<h3><i class='icon icon-envelope'></i> {{i18n private_message_info.title}}</h3>
<div class='participants clearfix'>
{{#groupedEach details.allowed_groups}}
<div class='user group'>
#{{unbound name}}
</div>
{{/groupedEach}}
{{#groupedEach details.allowed_users}}
<div class='user'>
<a href='/users/{{lower username}}'>
{{avatar this imageSize="small"}}
</a>
<a href='/users/{{lower username}}'>
{{unbound username}}
</a>
{{#if controller.model.details.can_remove_allowed_users}}
<a class='remove-invited' {{action removeAllowedUser username}}><i class="icon-remove"></i></a>
{{/if}}
</div>
{{/groupedEach}}
</div>
{{#if details.can_invite_to}}
<div class='controls'>
<button class='btn' {{action showPrivateInvite}}>{{i18n private_message_info.invite}}</button>
</div>
{{/if}}

8
app/assets/javascripts/discourse/views/topic_map/topic_map_view.js
View file

@ -57,7 +57,6 @@ Discourse.TopicMapView = Discourse.ContainerView.extend({
},
appendMapInformation: function(container) {
var topic = this.get('topic');
// If we have a best of capability
@ -67,12 +66,7 @@ Discourse.TopicMapView = Discourse.ContainerView.extend({
// If we have a private message
if (this.get('topic.isPrivateMessage')) {
container.attachViewWithArgs({
templateName: 'topic_map/private_message',
tagName: 'section',
classNames: ['information'],
content: this.get('controller')
}, Discourse.GroupedView);
container.attachViewWithArgs({ topic: topic, showPrivateInviteAction: 'showPrivateInvite' }, Discourse.DiscoursePrivateMessageMapComponent);
}
}
});