diff options
| author | jpl | 2017-03-20 16:14:45 +0100 |
|---|---|---|
| committer | jpl | 2017-03-20 16:19:26 +0100 |
| commit | c5410dbc633cf5e3eaae35c5cc02325fd963bc0c (patch) | |
| tree | 1a74267ba35e33e84c677db7b8ee5d5e95bdff8a /app/controllers/workbenches_controller.rb | |
| parent | b94059f6d7732eacd2d30f0840a2712f42d2e9e9 (diff) | |
| download | chouette-core-c5410dbc633cf5e3eaae35c5cc02325fd963bc0c.tar.bz2 | |
Refs #2706: Fix lines.count sorting on workbenches#show
Diffstat (limited to 'app/controllers/workbenches_controller.rb')
| -rw-r--r-- | app/controllers/workbenches_controller.rb | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/app/controllers/workbenches_controller.rb b/app/controllers/workbenches_controller.rb index a3370192b..cbbf1b058 100644 --- a/app/controllers/workbenches_controller.rb +++ b/app/controllers/workbenches_controller.rb @@ -10,8 +10,17 @@ class WorkbenchesController < BreadcrumbController @q = scope.ransack(params[:q]) @q.organisation_name_eq_any ||= current_organisation.name unless params[:q] - @collection = @q.result(distinct: true) - @wbench_refs = @collection.order(sort_column + ' ' + sort_direction).paginate(page: params[:page], per_page: 30) + @wbench_refs = @q.result + # @wbench_refs = Workbench.find(params[:id]).referentials + + case sort_column + when "lines" + @wbench_refs = @wbench_refs.joins(:metadatas).group("referentials.id").order("sum(array_length(referential_metadata.line_ids,1)) #{sort_direction}") + else + @wbench_refs = @wbench_refs.order("#{sort_column} #{sort_direction}") + end + + @wbench_refs = @wbench_refs.paginate(page: params[:page], per_page: 30) show! do build_breadcrumb :show @@ -30,7 +39,7 @@ class WorkbenchesController < BreadcrumbController private def sort_column - Workbench.find(params[:id]).referentials.include?(params[:sort]) ? params[:sort] : 'name' + (Workbench.find(params[:id]).referentials.column_names + %w{lines}).include?(params[:sort]) ? params[:sort] : 'name' end def sort_direction |