IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: Show tags on flags too

Browse Source
This commit is contained in:
Robin Ward 2019-04-05 14:22:27 -04:00
parent 8181ad646b
commit a6f283da30
6 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/assets/javascripts/discourse/templates/components/reviewable-flagged-post.hbs
View File

@ -1,11 +1,12 @@
{{reviewable-topic-link reviewable=reviewable tagName=''}} {{reviewable-topic-link reviewable=reviewable tagName=''}}
<div class='post-contents-wrapper'> <div class='post-contents-wrapper'>
{{reviewable-created-by user=reviewable.target_created_by tagName=''}} {{reviewable-created-by user=reviewable.target_created_by tagName=''}}
<div class='post-contents'> <div class='post-contents'>
{{reviewable-created-by-name user=reviewable.target_created_by tagName=''}} {{reviewable-created-by-name user=reviewable.target_created_by tagName=''}}
<div class='post-body'> <div class='post-body'>
{{{reviewable.cooked}}} {{{reviewable.cooked}}}
</div>
{{yield}}
</div> </div>
{{yield}}
</div>
</div> </div>

14
app/assets/javascripts/discourse/templates/components/reviewable-item.hbs
View File

@ -10,11 +10,11 @@
</span> </span>
<span class='status'> <span class='status'>
{{#if reviewable.approved}} {{#if reviewable.approved}}
<span class="approved"> {{d-icon "check"}} {{i18n "review.statuses.approved.title"}} </span> <span class="approved"> {{d-icon "check"}} {{i18n "review.statuses.approved.title"}} </span>
{{else if reviewable.rejected}} {{else if reviewable.rejected}}
<span class="rejected"> {{d-icon "times"}} {{i18n "review.statuses.rejected.title"}} </span> <span class="rejected"> {{d-icon "times"}} {{i18n "review.statuses.rejected.title"}} </span>
{{else if reviewable.ignored}} {{else if reviewable.ignored}}
<span class="ignored"> {{d-icon "external-link-alt"}} {{i18n "review.statuses.ignored.title"}} </span> <span class="ignored"> {{d-icon "external-link-alt"}} {{i18n "review.statuses.ignored.title"}} </span>
{{/if}} {{/if}}
</span> </span>
</div> </div>
@ -36,10 +36,10 @@
</div> </div>
{{else}} {{else}}
{{#component reviewableComponent reviewable=reviewable tagName=''}} {{#component reviewableComponent reviewable=reviewable tagName=''}}
<div class='reviewable-scores-and-history'> <div class='reviewable-scores-and-history'>
{{reviewable-scores scores=reviewable.reviewable_scores tagName=''}} {{reviewable-scores scores=reviewable.reviewable_scores tagName=''}}
{{reviewable-histories histories=reviewable.reviewable_histories tagName=''}} {{reviewable-histories histories=reviewable.reviewable_histories tagName=''}}
</div> </div>
{{/component}} {{/component}}
{{/if}} {{/if}}
</div> </div>

30
app/assets/javascripts/discourse/templates/components/reviewable-queued-post.hbs
View File

@ -1,29 +1,21 @@
{{#reviewable-topic-link reviewable=reviewable tagName=''}}
<div class="title-text">{{i18n "review.new_topic"}}
{{#reviewable-topic-link reviewable=reviewable tagName=''}}
<div class="title-text">{{i18n "review.new_topic"}}
{{reviewable.payload.title}} {{reviewable.payload.title}}
</div> </div>
{{category-badge reviewable.category}} {{category-badge reviewable.category}}
{{#if reviewable.payload.tags}} {{reviewable-tags tags=reviewable.payload.tags tagName=''}}
<div class="list-tags"> {{/reviewable-topic-link}}
{{#each reviewable.payload.tags as |t|}}
{{discourse-tag t}}
{{/each}}
</div>
{{/if}}
{{/reviewable-topic-link}}
<div class='post-contents-wrapper'> <div class='post-contents-wrapper'>
{{reviewable-created-by user=reviewable.created_by tagName=''}} {{reviewable-created-by user=reviewable.created_by tagName=''}}
<div class='post-contents'> <div class='post-contents'>
{{reviewable-created-by-name user=reviewable.created_by tagName=''}} {{reviewable-created-by-name user=reviewable.created_by tagName=''}}
<div class='post-body'> <div class='post-body'>
{{cook-text reviewable.payload.raw}} {{cook-text reviewable.payload.raw}}
</div>
{{yield}}
</div> </div>
{{yield}}
</div>
</div> </div>

5
app/assets/javascripts/discourse/templates/components/reviewable-tags.hbs Normal file
View File

@ -0,0 +1,5 @@
{{#if tags}}
<div class="list-tags">
{{#each tags as |t|}} {{discourse-tag t}} {{/each}}
</div>
{{/if}}

1
app/assets/javascripts/discourse/templates/components/reviewable-topic-link.hbs
View File

@ -3,6 +3,7 @@
{{topic-status topic=reviewable.topic}} {{topic-status topic=reviewable.topic}}
<a href={{reviewable.topic_url}} class='title-text'>{{reviewable.topic.title}}</a> <a href={{reviewable.topic_url}} class='title-text'>{{reviewable.topic.title}}</a>
{{category-badge reviewable.category}} {{category-badge reviewable.category}}
{{reviewable-tags tags=reviewable.topic_tags tagName=''}}
{{else if (has-block)}} {{else if (has-block)}}
{{yield}} {{yield}}
{{else}} {{else}}

11
app/serializers/reviewable_serializer.rb
View File

@ -11,11 +11,12 @@ class ReviewableSerializer < ApplicationSerializer
:type, :type,
:topic_id, :topic_id,
:topic_url, :topic_url,
:topic_tags,
:category_id, :category_id,
:created_at, :created_at,
:can_edit, :can_edit,
:score, :score,
:version :version,
) )
has_one :created_by, serializer: BasicUserSerializer, root: 'users' has_one :created_by, serializer: BasicUserSerializer, root: 'users'
@ -87,6 +88,14 @@ class ReviewableSerializer < ApplicationSerializer
data data
end end
def topic_tags
object.topic.tags.map(&:name)
end
def include_topic_tags?
object.topic.present? && SiteSetting.tagging_enabled?
end
def topic_url def topic_url
return object.target.url if object.target.is_a?(Post) return object.target.url if object.target.is_a?(Post)
return object.topic.url return object.topic.url