From 9b251b900ac9ae6acc5bdf02885136d16a6278e0 Mon Sep 17 00:00:00 2001 From: christinach Date: Fri, 11 Jun 2021 12:28:24 -0400 Subject: [PATCH] Add library in the holding_location delivery_locations array --- .../delivery_locations/show.json.jbuilder | 3 +-- .../_delivery_locations.json.jbuilder | 6 ++++-- lib/locations/version.rb | 2 +- .../holding_locations_json_view_spec.rb | 18 +++++++++++++++--- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/app/views/locations/delivery_locations/show.json.jbuilder b/app/views/locations/delivery_locations/show.json.jbuilder index 6227756..4827d9b 100644 --- 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 index baa9c8b..783049c 100644 --- 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 index 88e62e5..fa832ed 100644 --- 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 index 2471d88..9bdebbb 100644 --- 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 }