codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: tag input doesn't show staff-only tags to non-staff

Browse source
This commit is contained in:
Neil Lalonde 2016-05-26 17:24:03 -04:00
parent af1c994940
commit 3d5716a2c8
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/tag-chooser.js.es6
View file

@ -78,7 +78,7 @@ export default Ember.TextField.extend({
url: Discourse.getURL("/tags/filter/search"), url: Discourse.getURL("/tags/filter/search"),
dataType: 'json', dataType: 'json',
data: function (term) { data: function (term) {
return { q: term, limit: self.siteSettings.max_tag_search_results }; return { q: term, limit: self.siteSettings.max_tag_search_results, filterForInput: true };
}, },
results: function (data) { results: function (data) {
if (self.siteSettings.tags_sort_alphabetically) { if (self.siteSettings.tags_sort_alphabetically) {

5
app/controllers/tags_controller.rb
View file

@ -112,6 +112,11 @@ class TagsController < ::ApplicationController
query = query.where('tags.name like ?', "%#{term}%") query = query.where('tags.name like ?', "%#{term}%")
end end
if params[:filterForInput] && !guardian.is_staff?
staff_tag_names = SiteSetting.staff_tags.split("|")
query = query.where('tags.name NOT IN (?)', staff_tag_names) if staff_tag_names.present?
end
tags = query.count.map {|t, c| { id: t, text: t, count: c } } tags = query.count.map {|t, c| { id: t, text: t, count: c } }
render json: { results: tags } render json: { results: tags }