diff options
| author | Xinhui | 2017-03-24 17:16:57 +0100 |
|---|---|---|
| committer | Xinhui | 2017-03-24 17:16:57 +0100 |
| commit | 6580da810148d4ff90f69a7581d07c6bd41c1809 (patch) | |
| tree | 03e5d0b82bfacef479fef71d55fcd2beabc1da80 /app/controllers/workbenches_controller.rb | |
| parent | 8611cc5a73ec5033bd177e7999cf28174290b6ed (diff) | |
| parent | 2c21e6dbbd2ed85070ee1ebdd26ee97882f424dd (diff) | |
| download | chouette-core-6580da810148d4ff90f69a7581d07c6bd41c1809.tar.bz2 | |
Merge branch 'master' into staging
Diffstat (limited to 'app/controllers/workbenches_controller.rb')
| -rw-r--r-- | app/controllers/workbenches_controller.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/workbenches_controller.rb b/app/controllers/workbenches_controller.rb index 7f108b266..58fd507d4 100644 --- a/app/controllers/workbenches_controller.rb +++ b/app/controllers/workbenches_controller.rb @@ -7,9 +7,7 @@ class WorkbenchesController < BreadcrumbController def show scope = params[:q] ? resource.all_referentials : resource.referentials.ready scope = ransack_associated_lines(scope) - @q = ransack_periode(scope).ransack(params[:q]) - @q.organisation_name_eq_any ||= current_organisation.name unless params[:q] @wbench_refs = sort_result(@q.result).paginate(page: params[:page], per_page: 30) show! do build_breadcrumb :show |