Merge 9b251b9 into a236b55

pulibrary · Jun 11, 2021 · c8a706f · c8a706f
2 parents a236b55 + 9b251b9
commit c8a706f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/app/views/locations/delivery_locations/show.json.jbuilder b/app/views/locations/delivery_locations/show.json.jbuilder
@@ -1,4 +1,3 @@
 json.partial! 'locations/delivery_locations/show_single', delivery_location: @delivery_location
 
-json.partial! 'locations/holding_locations/json_partials/library',
-  library: @delivery_location.library
+json.partial! 'locations/holding_locations/json_partials/library', library: @delivery_location.library
diff --git a/app/views/locations/holding_locations/json_partials/_delivery_locations.json.jbuilder b/app/views/locations/holding_locations/json_partials/_delivery_locations.json.jbuilder
@@ -1,4 +1,6 @@
 json.delivery_locations delivery_locations do |delivery_location|
-  json.partial! 'locations/delivery_locations/show_single',
-    delivery_location: delivery_location
+  json.partial! 'locations/delivery_locations/show_single', delivery_location: delivery_location
+  json.library do
+    json.partial! 'locations/libraries/show_single', library: delivery_location.library
+  end
 end
diff --git a/lib/locations/version.rb b/lib/locations/version.rb
@@ -1,3 +1,3 @@
 module Locations
-  VERSION = "1.2.0"
+  VERSION = "1.5.0"
 end
diff --git a/spec/requests/locations/holding_locations_json_view_spec.rb b/spec/requests/locations/holding_locations_json_view_spec.rb
@@ -111,7 +111,11 @@ module Locations
               gfa_pickup: dl.gfa_pickup,
               staff_only: dl.staff_only,
               pickup_location: dl.pickup_location,
-              digital_location: dl.digital_location
+              digital_location: dl.digital_location,
+              library: { label: dl.library.label, 
+                          code: dl.library.code,
+                          order: dl.library.order
+                        }
             }
         end
         get holding_location_path(holding_location), params: { format: :json }
@@ -161,7 +165,11 @@ module Locations
               gfa_pickup: dl.gfa_pickup,
               staff_only: dl.staff_only,
               pickup_location: dl.pickup_location,
-              digital_location: dl.digital_location
+              digital_location: dl.digital_location,
+              library: { label: dl.library.label, 
+                          code: dl.library.code,
+                          order: dl.library.order
+                        }
             }
         end
         get holding_location_path(holding_location), params: { format: :json }
@@ -211,7 +219,11 @@ module Locations
               gfa_pickup: dl.gfa_pickup,
               staff_only: dl.staff_only,
               pickup_location: dl.pickup_location,
-              digital_location: dl.digital_location
+              digital_location: dl.digital_location,
+              library: { label: dl.library.label, 
+                          code: dl.library.code,
+                          order: dl.library.order
+                        }
             }
         end
         get holding_location_path(holding_location), params: { format: :json }