From dd2eae8f9c0bc72bc7852f07854437e271ce9593 Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Thu, 23 Sep 2021 10:50:36 -0400 Subject: [PATCH] DEV: Update bulk select in group topics list (#214) --- .../discourse/templates/components/assigned-topic-list.hbs | 1 + .../templates/components/basic-assigned-topic-list.hbs | 1 + .../javascripts/discourse/templates/group-topics-list.hbs | 6 ++---- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/javascripts/discourse/templates/components/assigned-topic-list.hbs b/assets/javascripts/discourse/templates/components/assigned-topic-list.hbs index ee1acdc..75f5df8 100644 --- a/assets/javascripts/discourse/templates/components/assigned-topic-list.hbs +++ b/assets/javascripts/discourse/templates/components/assigned-topic-list.hbs @@ -2,6 +2,7 @@ {{raw "topic-list-header" canBulkSelect=canBulkSelect + canDoBulkActions=canDoBulkActions toggleInTitle=toggleInTitle hideCategory=hideCategory showPosters=showPosters diff --git a/assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs b/assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs index db94795..5e61737 100644 --- a/assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs +++ b/assets/javascripts/discourse/templates/components/basic-assigned-topic-list.hbs @@ -15,6 +15,7 @@ expandExcerpts=expandExcerpts bulkSelectEnabled=bulkSelectEnabled canBulkSelect=canBulkSelect + bulkSelectAction=bulkSelectAction selected=selected skipHeader=skipHeader tagsForUser=tagsForUser diff --git a/assets/javascripts/discourse/templates/group-topics-list.hbs b/assets/javascripts/discourse/templates/group-topics-list.hbs index ca42ca5..90dc6da 100644 --- a/assets/javascripts/discourse/templates/group-topics-list.hbs +++ b/assets/javascripts/discourse/templates/group-topics-list.hbs @@ -10,10 +10,7 @@ {{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action=(action "loadMore")}} - {{bulk-select-button - selected=selected - action=(action "refresh") - }} + {{basic-assigned-topic-list topicList=model hideCategory=hideCategory @@ -27,6 +24,7 @@ tagsForUser=tagsForUser changeSort=(action "changeSort") toggleBulkSelect=(action "toggleBulkSelect") + bulkSelectAction=(action "refresh") unassign=(action "unassign") reassign=(action "reassign") onScroll=saveScrollPosition