From 9ee99166172a666184191181bd7ca03018403fa4 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@esilibrary.com>
Date: Fri, 2 Oct 2015 20:53:29 +0000
Subject: [PATCH] webstaff: teach the record merge modal how to display volumes

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 Open-ILS/src/templates/staff/cat/bucket/record/index.tt2           | 1 +
 Open-ILS/src/templates/staff/cat/bucket/record/t_merge_records.tt2 | 2 ++
 Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js          | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Open-ILS/src/templates/staff/cat/bucket/record/index.tt2 b/Open-ILS/src/templates/staff/cat/bucket/record/index.tt2
index 4f3c1ae634..82d087b2f4 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/record/index.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/record/index.tt2
@@ -13,6 +13,7 @@
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/cat/services/tagtable.js"></script>
 [% INCLUDE 'staff/cat/share/marcedit_strings.tt2' %]
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/cat/services/marcedit.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/cat/services/holdings.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/circ/services/holds.js"></script>
 [% INCLUDE 'staff/circ/share/hold_strings.tt2' %]
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/cat/bucket/record/app.js"></script>
diff --git a/Open-ILS/src/templates/staff/cat/bucket/record/t_merge_records.tt2 b/Open-ILS/src/templates/staff/cat/bucket/record/t_merge_records.tt2
index fb5e4fa492..ddcff75021 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/record/t_merge_records.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/record/t_merge_records.tt2
@@ -11,6 +11,7 @@
             <div ng-if="lead_id">
                <button class="btn btn-default btn-sm" ng-click="edit_lead()">[% l('Edit') %]</button>
                <eg-record-html record-id="lead_id"></eg-record-html>
+               <eg-volume-list record-id="lead_id"></eg-volume-list>
             </div>
             <div ng-if="!lead_id">
                 [% l('Please select a lead record from the right...') %]
@@ -23,6 +24,7 @@
                 <button class="btn btn-default btn-sm" ng-click="use_as_lead(rec)">[% l('Use as lead record') %]</button>
                 <button class="btn btn-default btn-sm" ng-click="drop(rec)">[% l('Remove from consideration') %]</button>
                 <eg-record-html record-id="rec.id"></eg-record-html>
+                <eg-volume-list record-id="rec.id"></eg-volume-list>
               </tab>
             </tabset>
           </div>
diff --git a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
index 313e9ab79d..0b9075e1dc 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
@@ -13,7 +13,7 @@
  */
 
 angular.module('egCatRecordBuckets', 
-    ['ngRoute', 'ui.bootstrap', 'egCoreMod', 'egUiMod', 'egGridMod', 'egMarcMod'])
+    ['ngRoute', 'ui.bootstrap', 'egCoreMod', 'egUiMod', 'egGridMod', 'egMarcMod', 'egHoldingsMod'])
 
 .config(function($routeProvider, $locationProvider, $compileProvider) {
     $locationProvider.html5Mode(true);
-- 
2.11.0