From 05b70c932bf8c1b2ce1b15ba6841778e07ba6ca8 Mon Sep 17 00:00:00 2001 From: Bernie Chiu Date: Fri, 1 Nov 2013 14:37:06 +0800 Subject: [PATCH] Fix tag cloud search under category filters --- .../panel/archive/front_end/archive_files_controller.rb | 2 +- .../panel/archive/widget/archive_files_controller.rb | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb b/vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb index 410cefd78..57b9683e6 100644 --- a/vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb +++ b/vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb @@ -36,7 +36,7 @@ class Panel::Archive::FrontEnd::ArchiveFilesController < OrbitWidgetController @page_num = 10 end - get_search_category(params[:search_query]) + # get_search_category(params[:search_query]) date_now = Time.now @archive_file_categorys = ArchiveFileCategory.all diff --git a/vendor/built_in_modules/archive/app/controllers/panel/archive/widget/archive_files_controller.rb b/vendor/built_in_modules/archive/app/controllers/panel/archive/widget/archive_files_controller.rb index abfa7d933..e77a93083 100644 --- a/vendor/built_in_modules/archive/app/controllers/panel/archive/widget/archive_files_controller.rb +++ b/vendor/built_in_modules/archive/app/controllers/panel/archive/widget/archive_files_controller.rb @@ -28,7 +28,12 @@ class Panel::Archive::Widget::ArchiveFilesController < OrbitWidgetController date_now = Time.now - if !params[:category_id].blank? + # binding.pry + + if !params[:category_id].blank? && !params[:tag_id].blank? + @archive_files = ArchiveFile.default_sort(params[:sort]).all.can_display.where(:tagged_ids.in => params[:tag_id]).any_in(:archive_file_category_id => params[:category_id]).merge(ArchiveFileCategory.excludes('disable' => true)).desc( :is_top ).page( params[:page_main] ).per(@page_num) + @archive_file_categorys = ArchiveFileCategory.any_in(:_id => params[:category_id]).excludes('disable' => true) + elsif !params[:category_id].blank? @archive_files = ArchiveFile.default_sort(params[:sort]).all.can_display.any_in(:archive_file_category_id => params[:category_id]).merge(ArchiveFileCategory.excludes('disable' => true)).desc( :is_top ).page( params[:page_main] ).per(@page_num) @archive_file_categorys = ArchiveFileCategory.any_in(:_id => params[:category_id]).excludes('disable' => true) elsif !params[:tag_id].blank?