From d8abe59b740052855ccec42b014957cf25989cac Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 16 Sep 2016 13:05:41 +0000 Subject: [PATCH] Bug 15503 [QA Followup] - Remove the use of GetBranchesLoop Signed-off-by: Nick Clemens --- acqui/addorderiso2709.pl | 3 ++- .../prog/en/modules/acqui/addorderiso2709.tt | 17 +++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index d4f423b..ba41100 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -43,6 +43,7 @@ use C4::Suggestions; # GetSuggestion use C4::Members; use Koha::Number::Price; +use Koha::Libraries; use Koha::Acquisition::Currencies; use Koha::Acquisition::Order; use Koha::Acquisition::Bookseller; @@ -569,7 +570,7 @@ sub import_biblios_list { "item_action_${item_action}" => 1, item_action => $item_action, item_error => $item_error, - branchloop => GetBranchesLoop(), + libraries => scalar Koha::Libraries->search(), locationloop => \@locations, itypeloop => \@itypes, ccodeloop => \@ccodes, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index 4b6a3e1..1aa34a9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -1,4 +1,5 @@ [% USE KohaDates %] +[% USE Branches %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › Order staged MARC records [% IF ( batch_details ) %] @@ -293,22 +294,22 @@ <ol> <li> <label for="homebranch_item_[% item.item_id %]">homebranch</label><select id="homebranch_item_[% item.item_id %]" name="homebranch_[% item.biblio_count %]"> - [% FOREACH branchloo IN branchloop %] - [% IF ( branchloo.value ) == ( item.homebranch ) %] - <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option> + [% FOREACH l IN libraries %] + [% IF l.branchcode == item.homebranch %] + <option value="[% l.branchcode %]" selected="selected">[% l.branchname %]</option> [% ELSE %] - <option value="[% branchloo.value %]">[% branchloo.branchname %]</option> + <option value="[% l.branchcode %]">[% l.branchname %]</option> [% END %] [% END %] </select> </li> <li><label for="holdingbranch_item_[% item.item_id %]">holdingbranch</label><select id="holdingbranch_item_[% item.item_id %]" name="holdingbranch_[% item.biblio_count %]"> - [% FOREACH branchloo IN branchloop %] - [% IF ( branchloo.value ) == ( item.holdingbranch ) %] - <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option> + [% FOREACH l IN libraries %] + [% IF l.branchcode == item.holdingbranch %] + <option value="[% l.branchcode %]" selected="selected">[% l.branchname %]</option> [% ELSE %] - <option value="[% branchloo.value %]">[% branchloo.branchname %]</option> + <option value="[% l.branchcode %]">[% l.branchname %]</option> [% END %] [% END %] </select> -- 2.1.4