diff options
| author | jpl | 2017-02-03 16:25:40 +0100 |
|---|---|---|
| committer | jpl | 2017-02-03 16:25:52 +0100 |
| commit | 7d975c31a7fc874bb83fa00ff658a50826ff6070 (patch) | |
| tree | e8bced22437e7d69d1db82516fc32167366fa1ee /app/controllers | |
| parent | 25c192b1a5cac1397c73ca029124cbeeda156fa5 (diff) | |
| download | chouette-core-7d975c31a7fc874bb83fa00ff658a50826ff6070.tar.bz2 | |
Refs #2518: adding search_bar component, on workbench#show
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/workbenches_controller.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/app/controllers/workbenches_controller.rb b/app/controllers/workbenches_controller.rb index bca1ed032..772c79449 100644 --- a/app/controllers/workbenches_controller.rb +++ b/app/controllers/workbenches_controller.rb @@ -4,13 +4,16 @@ class WorkbenchesController < BreadcrumbController respond_to :html, :only => [:show] def show - @wbench_refs = if params[:show_all] - Workbench.find(params[:id]).all_referentials.order(sort_column + ' ' + sort_direction).paginate(page: params[:page], per_page: 30) + if params[:show_all] + @q = Workbench.find(params[:id]).all_referentials.ransack(params[:q]) else - Workbench.find(params[:id]).referentials.ready.order(sort_column + ' ' + sort_direction).paginate(page: params[:page], per_page: 30) - # Workbench.find(params[:id]).referentials.order(sort_column + ' ' + sort_direction).paginate(page: params[:page], per_page: 30) + @q = Workbench.find(params[:id]).referentials.ready.ransack(params[:q]) + # @q = Workbench.find(params[:id]).referentials.ransack(params[:q]) end + @collection = @q.result(distinct: true) + @wbench_refs = @collection.order(sort_column + ' ' + sort_direction).paginate(page: params[:page], per_page: 30) + show! do build_breadcrumb :show end |