Attachment 55616 Details for Bug 15503 – Bug 15503 [QA Followup] - Remove the use of GetBranchesLoop

[patch] Bug 15503 [QA Followup] - Remove the use of GetBranchesLoop

Bug-15503-QA-Followup---Remove-the-use-of-GetBranc.patch (text/plain), 3.91 KB, created by Kyle M Hall (khall) on 2016-09-16 13:22:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2016-09-16 13:22:54 UTC

Size: 3.91 KB

patch

obsolete

>From 87b4ff92ff1ccab67162c9934fc065b7d2545e65 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Fri, 16 Sep 2016 13:05:41 +0000
>Subject: [PATCH] Bug 15503 [QA Followup] - Remove the use of GetBranchesLoop
>
>---
> 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..14ded0b 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 => 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' %]
> <title>Koha &rsaquo; Acquisitions &rsaquo; 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

Actions: View | Diff | Splinter Review

Attachments on bug 15503: 53493 | 54480 | 54660 | 55057 | 55616 | 55617 | 55926 | 55927 | 55928 | 56851 | 56852 | 57123 | 57124 | 57125 | 57715 | 58103 | 58132 | 58164 | 58165 | 58166 | 58376 | 58377 | 59093 | 59097 | 59415 | 59416 | 59417 | 59418 | 59419 | 59420 | 59421 | 59515 | 60025 | 60026 | 60027 | 60028 | 60029 | 60030 | 60031 | 60032 | 60203 | 60204 | 60205 | 60206 | 60207 | 60208 | 60209 | 60210 | 60211