Refs #2482: adding sortable columns to workbenches#show

1 files changed, 11 insertions, 2 deletions

diff --git a/app/controllers/workbenches_controller.rb b/app/controllers/workbenches_controller.rb
index 7c04eea3d..bca1ed032 100644
--- a/app/controllers/workbenches_controller.rb
+++ b/app/controllers/workbenches_controller.rb
@@ -5,9 +5,10 @@ class WorkbenchesController < BreadcrumbController
 
   def show
     @wbench_refs = if params[:show_all]
-      Workbench.find(params[:id]).all_referentials.paginate(page: params[:page], per_page: 20)
+      Workbench.find(params[:id]).all_referentials.order(sort_column + ' ' + sort_direction).paginate(page: params[:page], per_page: 30)
     else
-      Workbench.find(params[:id]).referentials.ready.paginate(page: params[:page], per_page: 20)
+      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)
     end
 
     show! do
@@ -15,4 +16,12 @@ class WorkbenchesController < BreadcrumbController
     end
   end
 
+  private
+  def sort_column
+    Workbench.find(params[:id]).referentials.include?(params[:sort]) ? params[:sort] : 'name'
+  end
+  def sort_direction
+    %w[asc desc].include?(params[:direction]) ?  params[:direction] : 'asc'
+  end
+
 end