diff options
| author | Robert | 2017-06-26 12:42:08 +0200 |
|---|---|---|
| committer | Robert | 2017-06-26 12:42:08 +0200 |
| commit | eabd56ff9f2c7979192e54b4ae11673f1cc778c1 (patch) | |
| tree | b71c8df0e909a298251959105213f4acbe946fe8 | |
| parent | 6c10034434d5855dfb1e6c5165880b4df0bcf1b4 (diff) | |
| parent | 8e7eb2e722ad4615f4b34253dd2fcaa6226887a9 (diff) | |
| download | chouette-core-eabd56ff9f2c7979192e54b4ae11673f1cc778c1.tar.bz2 | |
Merge branch 'master' of github.com:af83/stif-boiv
| -rw-r--r-- | app/controllers/workbenches_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/workbenches_controller.rb b/app/controllers/workbenches_controller.rb index b178a7fe2..83762d83f 100644 --- a/app/controllers/workbenches_controller.rb +++ b/app/controllers/workbenches_controller.rb @@ -16,14 +16,13 @@ class WorkbenchesController < BreadcrumbController ransack_params = params[:q].merge(archived_at_not_null: nil, archived_at_null: nil).clone ransack_params.delete('associated_lines_id_eq') - q_for_result = scope.ransack(ransack_params) - @wbench_refs = sort_result(q_for_result.result).paginate(page: params[:page], per_page: 30) + @q = scope.ransack(ransack_params) + @wbench_refs = sort_result(@q.result).paginate(page: params[:page], per_page: 30) @wbench_refs = ModelDecorator.decorate( @wbench_refs, with: ReferentialDecorator ) - @q = scope.ransack(params[:q]) show! do build_breadcrumb :show end |