ItemDisplay#current_location can never pass its conditions, so I'm re…

…moving it.
sul-dlss · Sep 30, 2022 · fd904f2 · fd904f2
1 parent 186578e
commit fd904f2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/lib/item_display.rb b/lib/item_display.rb
@@ -18,14 +18,6 @@ def initialize(record = nil, holding = nil, context = nil)
     @context = context
   end
 
-  def current_location
-    return 'ON-ORDER' if @holding.is_on_order? &&
-                         @holding.current_location && !@holding.current_location.empty? &&
-                         @holding.home_location != 'ON-ORDER' && @holding.home_location != 'INPROCESS'
-
-    @holding.current_location
-  end
-
   def call_number
     return if (@holding.ignored_call_number? && !@holding.shelved_by_location?) &&
               (!@holding.e_call_number? || call_number_with_enumeration.to_s == SirsiHolding::ECALLNUM ||

diff --git a/lib/traject/config/sirsi_config.rb b/lib/traject/config/sirsi_config.rb
@@ -2145,7 +2145,7 @@ def holdings(record, context)
       holding.barcode,
       holding.library,
       holding.home_location,
-      item_display.current_location,
+      holding.current_location,
       holding.type,
       item_display.lopped_call_number,
       item_display.shelfkey,