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

FIX: Don't show the filter title on the default route

Browse source
This commit is contained in:
Robin Ward 2015-03-30 11:40:44 -04:00
parent 10b8eca9a6
commit 28864e74bc
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/list_controller.rb
View file

@ -50,7 +50,7 @@ class ListController < ApplicationController
].flatten
# Create our filters
Discourse.filters.each do |filter|
Discourse.filters.each_with_index do |filter, idx|
define_method(filter) do |options = nil|
list_opts = build_topic_list_options
list_opts.merge!(options) if options
@ -68,7 +68,8 @@ class ListController < ApplicationController
@description = SiteSetting.site_description
@rss = filter
if use_crawler_layout?
# Note the first is the default and we don't add a title
if idx > 0 && use_crawler_layout?
filter_title = I18n.t("js.filters.#{filter.to_s}.title")
if list_opts[:category]
@title = I18n.t('js.filters.with_category', filter: filter_title, category: Category.find(list_opts[:category]).name)

12
spec/controllers/list_controller_spec.rb
View file

@ -11,6 +11,18 @@ describe ListController do
SiteSetting.stubs(:top_menu).returns('latest,-video|new|unread|categories|category/beer')
end
describe 'titles for crawler layout' do
it 'has no title for the default URL' do
xhr :get, Discourse.anonymous_filters[0], _escaped_fragment_: 'true'
expect(assigns(:title)).to be_blank
end
it 'has a title for non-default URLs' do
xhr :get, Discourse.anonymous_filters[1], _escaped_fragment_: 'true'
expect(assigns(:title)).to be_present
end
end
describe 'indexes' do
(Discourse.anonymous_filters - [:categories]).each do |filter|