From 65abe1c6cf2cdbf2cb3d99fdd69dc948ebdcc300 Mon Sep 17 00:00:00 2001 From: "karel.picman@lbcfree.net" Date: Tue, 31 Aug 2021 12:38:00 +0200 Subject: [PATCH] Error when sorting on custom field #1279 --- app/models/dmsf_query.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/dmsf_query.rb b/app/models/dmsf_query.rb index 3f98bb06..af03faaf 100644 --- a/app/models/dmsf_query.rb +++ b/app/models/dmsf_query.rb @@ -170,10 +170,10 @@ class DmsfQuery < Query order_option = ['sort', group_by_sort_order, (options[:order] || sort_clause[0])].flatten.reject(&:blank?) if order_option.size > 1 DmsfFileRevisionCustomField.visible.pluck(:id, :name).each do |id, name| - order_option[1].gsub!("COALESCE(cf_#{id}.value, '')", "cf_#{id}") + order_option[1].gsub!("cf_#{id}.value", "cf_#{id}") end - if order_option[1] =~ /(DESC|ASC)$/ - order_option[1].gsub!(',', " #{$1},") + if order_option[1] =~ /(firstname|major_version), (lastname|minor_version) (DESC|ASC)$/ + order_option[1].gsub!(',', " #{$3},") end end