From 89d2750fc4b0d622dc7aae6ccc533d692838fb3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Turbelin?= Date: Tue, 4 Feb 2020 22:04:09 +0100 Subject: [PATCH] Set default value at backend side --- app/assets/javascripts/admin/bulk_product_update.js.coffee | 2 +- app/controllers/api/products_controller.rb | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee index b748bc6230..289cab1e74 100644 --- a/app/assets/javascripts/admin/bulk_product_update.js.coffee +++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee @@ -56,7 +56,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout 'q[name_cont]': $scope.query, 'q[supplier_id_eq]': $scope.producerFilter, 'q[primary_taxon_id_eq]': $scope.categoryFilter, - 'q[s]': $scope.sorting || 'created_at asc', + 'q[s]': $scope.sorting, import_date: $scope.importDateFilter, page: $scope.page, per_page: $scope.per_page diff --git a/app/controllers/api/products_controller.rb b/app/controllers/api/products_controller.rb index 6d2d12837a..548b21cac0 100644 --- a/app/controllers/api/products_controller.rb +++ b/app/controllers/api/products_controller.rb @@ -60,7 +60,7 @@ module Api end @products = product_query. - ransack(params[:q]). + ransack(query_params_with_defaults). result. page(params[:page] || DEFAULT_PAGE). per(params[:per_page] || DEFAULT_PER_PAGE) @@ -142,6 +142,10 @@ module Api }.to_json end + def query_params_with_defaults + params[:q].to_h.reverse_merge!({ 's' => 'created_at DESC' }) + end + def pagination_data(results) { results: results.total_count,