Browse Source

Followup a87685d - Stabilise sorting in production environment

Mantas Masalskis 1 month ago
parent
commit
e868ce7fd7

+ 3 - 3
Gemfile

@@ -212,6 +212,9 @@ gem 'listen'
 # language detection
 gem 'cld'
 
+# CLDR wrapper for i18n and l10n
+gem 'twitter_cldr'
+
 # Gems used only for develop/test and not required
 # in production environments by default.
 group :development, :test do
@@ -272,9 +275,6 @@ group :development, :test do
 
   # Debugging and profiling
   gem 'pry-doc' # This gem is very large, so don't include it in production.
-
-  # CLDR wrapper for i18n and l10n
-  gem 'twitter_cldr'
 end
 
 # To permanently extend Zammad with additional gems, you can specify them in Gemfile.local.

+ 1 - 1
app/models/concerns/can_selector/advanced_sorting/translated_relation_sort.rb

@@ -6,7 +6,7 @@ module CanSelector
       def self.applicable?(input, locale, object)
         return false if locale.blank?
 
-        attr = ObjectManager::Attribute.get(object: object.class_name, name: column_name(input, object))
+        attr = ObjectManager::Attribute.get(object: object.name, name: column_name(input, object))
         return false if attr.nil?
 
         attr.data_option[:relation].present? && attr.data_option[:translate]

+ 1 - 1
app/models/concerns/can_selector/advanced_sorting/untranslated_relation_sort.rb

@@ -6,7 +6,7 @@ module CanSelector
       def self.applicable?(input, locale, object)
         return false if locale.blank?
 
-        attr = ObjectManager::Attribute.get(object: object.class_name, name: column_name(input, object))
+        attr = ObjectManager::Attribute.get(object: object.name, name: column_name(input, object))
         return false if attr.nil?
 
         attr.data_option[:relation].present? && !attr.data_option[:translate]