diff options
| author | Luc Donnet | 2014-09-23 13:40:59 +0200 |
|---|---|---|
| committer | Luc Donnet | 2014-09-23 13:40:59 +0200 |
| commit | a75d5d2924b5e95b2484920e3f623c7f174ad63b (patch) | |
| tree | 964fea16d71754f99d50d56cd0808e7d92d53dc7 /app/controllers/time_tables_controller.rb | |
| parent | 740447aa5054e0230a1280a99a954987b4a6696d (diff) | |
| parent | 3aeb2937f4a354bd45194ecae408667cd9f1ccc1 (diff) | |
| download | chouette-core-a75d5d2924b5e95b2484920e3f623c7f174ad63b.tar.bz2 | |
Merge branch 'sismo' of github.com:afimb/chouette2 into sismo
Diffstat (limited to 'app/controllers/time_tables_controller.rb')
| -rw-r--r-- | app/controllers/time_tables_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/time_tables_controller.rb b/app/controllers/time_tables_controller.rb index b80f53b77..54b0a3bac 100644 --- a/app/controllers/time_tables_controller.rb +++ b/app/controllers/time_tables_controller.rb @@ -67,7 +67,7 @@ class TimeTablesController < ChouetteController tag_search = ransack_params["tag_search"].split(",").collect(&:strip) if ransack_params.present? && ransack_params["tag_search"].present? ransack_params.delete("tag_search") if ransack_params.present? - selected_time_tables = tag_search ? select_time_tables.tagged_with(tag_search) : select_time_tables + selected_time_tables = tag_search ? select_time_tables.tagged_with(tag_search, :wild => true, :any => true) : select_time_tables @q = selected_time_tables.search(ransack_params) @time_tables ||= @q.result(:distinct => true).order(:comment).paginate(:page => params[:page]) end |