From a4e7657bbfae3ba2cdbf0f3d1925915f20ae71b9 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 6 Jan 2017 11:40:32 +0800 Subject: [PATCH] FIX: Missing action to show login modal on group page. --- .../javascripts/discourse/controllers/groups.js.es6 | 4 ---- .../javascripts/discourse/templates/group-index.hbs | 9 ++++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/groups.js.es6 b/app/assets/javascripts/discourse/controllers/groups.js.es6 index f427b613160..d8ce08f3227 100644 --- a/app/assets/javascripts/discourse/controllers/groups.js.es6 +++ b/app/assets/javascripts/discourse/controllers/groups.js.es6 @@ -11,10 +11,6 @@ export default Ember.Controller.extend({ actions: { loadMore() { this.get('groups').loadMore(); - }, - - showLogin() { - return this.get('application').send('appRouteAction', 'showLogin'); } } }); diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/templates/group-index.hbs index 83babdf23a2..86a35b11122 100644 --- a/app/assets/javascripts/discourse/templates/group-index.hbs +++ b/app/assets/javascripts/discourse/templates/group-index.hbs @@ -1,7 +1,8 @@ -{{#if hasMembers}} - {{group-membership-button model=model - createNewMessageViaParams='createNewMessageViaParams'}} +{{group-membership-button model=model + createNewMessageViaParams='createNewMessageViaParams' + showLogin='showLogin'}} +{{#if hasMembers}} {{#load-more selector=".group-members tr" action="loadMore"}} @@ -32,5 +33,7 @@ {{conditional-loading-spinner condition=loading}} {{else}} +
+
{{i18n "groups.empty.members"}}
{{/if}}