From 53f72918fa25d1e7cd10b1e48b553f3a2d56e248 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Fri, 9 Sep 2016 16:35:49 +0000
Subject: [PATCH] Bug 8030 - (QA Folllowup) Use Koha::Libraries

---
 koha-tmpl/intranet-tmpl/prog/js/holds.js | 3 ++-
 svc/holds                                | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js
index b95cac0..8d51474 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/holds.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/holds.js
@@ -106,6 +106,7 @@ $(document).ready(function() {
                                     var selectedbranch;
                                     var setbranch;
                                     if( oObj.branches[i].selected ){
+
                                         selectedbranch = " selected='selected' ";
                                         setbranch = CURRENT;
                                     }
@@ -113,7 +114,7 @@ $(document).ready(function() {
                                         selectedbranch = '';
                                         setbranch = '';
                                     }
-                                    branchSelect += '<option value="'+ oObj.branches[i].value +'"'+selectedbranch+'>'+oObj.branches[i].branchname+setbranch+'</option>';
+                                    branchSelect += '<option value="'+ oObj.branches[i].branchcode +'"'+selectedbranch+'>'+oObj.branches[i].branchname+setbranch+'</option>';
                                 }
                                 branchSelect +='</select>';
                                 return branchSelect;
diff --git a/svc/holds b/svc/holds
index 9faa4d2..3c3a2b0 100755
--- a/svc/holds
+++ b/svc/holds
@@ -79,6 +79,10 @@ while ( my $h = $holds_rs->next() ) {
         $itemtype_limit = $itemtype->{translated_description};
     }
 
+    my $libraries = Koha::Libraries->search({}, { order_by => ['branchname'] })->unblessed;
+    for my $library ( @$libraries ) {
+        $library->{selected} = 1 if $library->{branchcode} eq $h->branchcode();
+    }
     my $hold = {
         DT_RowId       => $h->reserve_id(),
         biblionumber   => $biblionumber,
@@ -86,7 +90,7 @@ while ( my $h = $holds_rs->next() ) {
         author         => $h->biblio()->author(),
         reserve_id     => $h->reserve_id(),
         branchcode     => $h->branch()->branchname(),
-        branches       => GetBranchesLoop($h->branch()->branchcode()),
+        branches       => $libraries,
         reservedate    => $h->reservedate(),
         expirationdate => $h->expirationdate(),
         suspend        => $h->suspend(),
-- 
2.1.4