From 65caf04ddc3bb4edb99e66ce7f86fb73b28d607f Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Fri, 25 Jan 2019 20:13:54 +0530 Subject: [PATCH] clean up unused code Unused PM topic list column 'Users' is removed --- .../javascripts/discourse/routes/user-topic-list.js.es6 | 3 +-- .../discourse/templates/components/basic-topic-list.hbs | 3 +-- .../discourse/templates/components/topic-list.hbs | 2 -- .../discourse/templates/list/topic-list-item.raw.hbs | 4 ---- .../templates/mobile/components/basic-topic-list.hbs | 7 ------- .../discourse/templates/topic-list-header.raw.hbs | 3 --- .../javascripts/discourse/templates/user-topics-list.hbs | 1 - 7 files changed, 2 insertions(+), 21 deletions(-) diff --git a/app/assets/javascripts/discourse/routes/user-topic-list.js.es6 b/app/assets/javascripts/discourse/routes/user-topic-list.js.es6 index 3d62ae91de..c7bd8ed147 100644 --- a/app/assets/javascripts/discourse/routes/user-topic-list.js.es6 +++ b/app/assets/javascripts/discourse/routes/user-topic-list.js.es6 @@ -11,8 +11,7 @@ export default Discourse.Route.extend(ViewingActionType, { this.controllerFor("user-activity").set("userActionType", userActionType); this.controllerFor("user-topics-list").setProperties({ model, - hideCategory: false, - showParticipants: false + hideCategory: false }); } }); diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs index ec15b78c9b..d1d105121e 100644 --- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs +++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs @@ -10,8 +10,7 @@ {{/if}} {{#if topics}} - {{topic-list showParticipants=showParticipants - showPosters=showPosters + {{topic-list showPosters=showPosters hideCategory=hideCategory topics=topics expandExcerpts=expandExcerpts diff --git a/app/assets/javascripts/discourse/templates/components/topic-list.hbs b/app/assets/javascripts/discourse/templates/components/topic-list.hbs index bcdbf0123c..46e05f4e4d 100644 --- a/app/assets/javascripts/discourse/templates/components/topic-list.hbs +++ b/app/assets/javascripts/discourse/templates/components/topic-list.hbs @@ -7,7 +7,6 @@ showPosters=showPosters showLikes=showLikes showOpLikes=showOpLikes - showParticipants=showParticipants order=order ascending=ascending sortable=sortable @@ -35,7 +34,6 @@ showTopicPostBadges=showTopicPostBadges hideCategory=hideCategory showPosters=showPosters - showParticipants=showParticipants showLikes=showLikes showOpLikes=showOpLikes expandGloballyPinned=expandGloballyPinned diff --git a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs index ab0e1e3148..6b6b7b2af1 100644 --- a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs +++ b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs @@ -44,10 +44,6 @@ {{raw "list/posts-count-column" topic=topic}} -{{#if showParticipants}} - {{raw "list/posters-column" posters=topic.participants}} -{{/if}} - {{#if showLikes}} {{#if hasLikes}} diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs index 01a640c159..2c5eb2f4d5 100644 --- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs @@ -46,13 +46,6 @@ {{category-link t.category}} {{/unless}} - {{#if showParticipants}} -
- {{#each participants as |p|}} - {{avatar p usernamePath="user.username" imageSize="small"}} - {{/each}} -
- {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs b/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs index 54a7de63eb..e3468a1c95 100644 --- a/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs +++ b/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs @@ -10,9 +10,6 @@ {{raw "topic-list-header-column" order='posters'}} {{/if}} {{raw "topic-list-header-column" sortable=sortable number='true' order='posts' name='replies'}} -{{#if showParticipants}} - {{raw "topic-list-header-column" order='participants' name='users'}} -{{/if}} {{#if showLikes}} {{raw "topic-list-header-column" sortable=sortable number='true' order='likes' name='likes'}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/templates/user-topics-list.hbs index d0b5008101..e59ec595e1 100644 --- a/app/assets/javascripts/discourse/templates/user-topics-list.hbs +++ b/app/assets/javascripts/discourse/templates/user-topics-list.hbs @@ -1,7 +1,6 @@ {{#load-more class="paginated-topics-list" selector=".paginated-topics-list .topic-list tr" action=(action "loadMore")}} {{basic-topic-list topicList=model hideCategory=hideCategory - showParticipants=showParticipants showPosters=showPosters bulkSelectEnabled=bulkSelectEnabled selected=selected