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

DEV: include TopicQueryParams in TagsController (#8045)

Browse Source 
* DEV: include TopicQueryParams in TagsController

* Fix rubocop
This commit is contained in:
Osama Sayegh
2019-08-28 11:41:50 +03:00
committed by GitHub
parent d14851e552
commit 68f87dffa5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/tags_controller.rb
View File

@@ -1,11 +1,13 @@
# frozen_string_literal: true # frozen_string_literal: true
require_dependency 'topic_list_responder' require_dependency 'topic_list_responder'
require_dependency 'topic_query_params'
require_dependency 'topics_bulk_action' require_dependency 'topics_bulk_action'
require_dependency 'topic_query' require_dependency 'topic_query'
class TagsController < ::ApplicationController class TagsController < ::ApplicationController
include TopicListResponder include TopicListResponder
include TopicQueryParams
before_action :ensure_tags_enabled before_action :ensure_tags_enabled
@@ -355,7 +357,7 @@ class TagsController < ::ApplicationController
end end
def build_topic_list_options def build_topic_list_options
options = { options = super.merge(
page: params[:page], page: params[:page],
topic_ids: param_to_integer_list(:topic_ids), topic_ids: param_to_integer_list(:topic_ids),
exclude_category_ids: params[:exclude_category_ids], exclude_category_ids: params[:exclude_category_ids],
@@ -369,7 +371,7 @@ class TagsController < ::ApplicationController
state: params[:state], state: params[:state],
search: params[:search], search: params[:search],
q: params[:q] q: params[:q]
} )
options[:no_subcategories] = true if params[:no_subcategories] == 'true' options[:no_subcategories] = true if params[:no_subcategories] == 'true'
if params[:tag_id] == 'none' if params[:tag_id] == 'none'