diff --git a/lib/blacklight/configuration/field.rb b/lib/blacklight/configuration/field.rb index 7328130b7..1176d7fa0 100644 --- a/lib/blacklight/configuration/field.rb +++ b/lib/blacklight/configuration/field.rb @@ -17,20 +17,20 @@ class Configuration::Field < OpenStructWithHashAccess def normalize! _blacklight_config = nil self.field ||= key - self.key ||= self.field + self.key ||= field self.label ||= default_label self.if = true if self.if.nil? self.unless = false if self.unless.nil? - self.field &&= self.field.to_s + self.field &&= field.to_s self end def validate! - raise ArgumentError, "Must supply a field name" if self.field.nil? + raise ArgumentError, "Must supply a field name" if field.nil? end def display_label(context = nil, **) @@ -44,10 +44,10 @@ def display_label(context = nil, **) end def default_label - if self.key.respond_to?(:titleize) - self.key.titleize + if key.respond_to?(:titleize) + key.titleize else - self.key.to_s.titleize + key.to_s.titleize end end diff --git a/lib/blacklight/configuration/sort_field.rb b/lib/blacklight/configuration/sort_field.rb index 702bcdcc2..2e7b820c9 100644 --- a/lib/blacklight/configuration/sort_field.rb +++ b/lib/blacklight/configuration/sort_field.rb @@ -10,13 +10,13 @@ def normalize! blacklight_config = nil self.field ||= label&.parameterize self.field ||= sort - self.sort ||= self.field + self.sort ||= field self end def validate! - raise ArgumentError.new, "Must supply a sort string" if self.sort.nil? + raise ArgumentError.new, "Must supply a sort string" if sort.nil? end end end