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

Cleanup

This commit is contained in:
James Kiesel 2016-08-12 15:56:56 -04:00
parent 3471499613
commit e14f3c802b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/controllers/tags-show.js.es6
View File

@ -74,7 +74,7 @@ export default Ember.Controller.extend(BulkTopicSelection, {
showAdminControls: function() { showAdminControls: function() {
return !this.get('secondaryTag') && this.get('canAdminTag') && !this.get('category'); return !this.get('secondaryTag') && this.get('canAdminTag') && !this.get('category');
}.property('canAdminTag', 'category'), }.property('secondaryTag', 'canAdminTag', 'category'),
loadMoreTopics() { loadMoreTopics() {
return this.get("list").loadMore(); return this.get("list").loadMore();

2
app/assets/javascripts/discourse/templates/tags/show.hbs
View File

@ -34,7 +34,7 @@
{{fa-icon "angle-right"}} {{fa-icon "angle-right"}}
{{discourse-tag-bound tagRecord=tag style="simple"}} {{discourse-tag-bound tagRecord=tag style="simple"}}
{{#if secondaryTag}} {{#if secondaryTag}}
<span>&</span> <span>&amp;</span>
{{discourse-tag-bound tagRecord=secondaryTag style="simple"}} {{discourse-tag-bound tagRecord=secondaryTag style="simple"}}
{{/if}} {{/if}}
</h2> </h2>

2
lib/topic_query.rb
View File

@ -462,8 +462,8 @@ class TopicQuery
if @options[:tags] && @options[:tags].size > 0 if @options[:tags] && @options[:tags].size > 0
result = result.joins(:tags) result = result.joins(:tags)
# ALL of the given tags:
if @options[:match_all_tags] if @options[:match_all_tags]
# ALL of the given tags:
@options[:tags] = Tag.where(name: @options[:tags]).pluck(:id) unless @options[:tags][0].is_a?(Integer) @options[:tags] = Tag.where(name: @options[:tags]).pluck(:id) unless @options[:tags][0].is_a?(Integer)
@options[:tags].each_with_index do |tag, index| @options[:tags].each_with_index do |tag, index|
sql_alias = ['t', index].join sql_alias = ['t', index].join