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

FIX: Adding components to a ContainerView doesn't set the context 

properly.
This commit is contained in:
Robin Ward 2014-01-20 17:12:37 -05:00
parent 5feb5ee54d
commit 8c32f22ae0
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/components/private_message_map_component.js
View File

@ -6,12 +6,18 @@
@namespace Discourse @namespace Discourse
@module Discourse @module Discourse
**/ **/
Discourse.PrivateMessageMapComponent = Ember.Component.extend({ Discourse.PrivateMessageMapComponent = Ember.View.extend({
templateName: 'components/private-message-map', templateName: 'components/private-message-map',
tagName: 'section', tagName: 'section',
classNames: ['information'], classNames: ['information'],
details: Em.computed.alias('topic.details'), details: Em.computed.alias('topic.details'),
init: function() {
this._super();
this.set('context', this);
this.set('controller', this);
},
actions: { actions: {
removeAllowedUser: function(user) { removeAllowedUser: function(user) {
var self = this; var self = this;

8
app/assets/javascripts/discourse/templates/components/private-message-map.js.handlebars
View File

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