aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/networks_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/networks_controller.rb')
-rw-r--r--app/controllers/networks_controller.rb16
1 files changed, 15 insertions, 1 deletions
diff --git a/app/controllers/networks_controller.rb b/app/controllers/networks_controller.rb
index 8d6fc9a8e..d9070e7e8 100644
--- a/app/controllers/networks_controller.rb
+++ b/app/controllers/networks_controller.rb
@@ -40,7 +40,12 @@ class NetworksController < BreadcrumbController
def collection
@q = line_referential.networks.search(params[:q])
- @networks ||= @q.result(:distinct => true).order(:name).paginate(:page => params[:page])
+
+ if sort_column && sort_direction
+ @networks ||= @q.result(:distinct => true).order(sort_column + ' ' + sort_direction).paginate(:page => params[:page])
+ else
+ @networks ||= @q.result(:distinct => true).order(:name).paginate(:page => params[:page])
+ end
end
def resource_url(network = nil)
@@ -64,4 +69,13 @@ class NetworksController < BreadcrumbController
params.require(:network).permit(:objectid, :object_version, :creation_time, :creator_id, :version_date, :description, :name, :registration_number, :source_name, :source_type_name, :source_identifier, :comment )
end
+ private
+
+ def sort_column
+ line_referential.networks.column_names.include?(params[:sort]) ? params[:sort] : 'name'
+ end
+ def sort_direction
+ %w[asc desc].include?(params[:direction]) ? params[:direction] : 'asc'
+ end
+
end