From ebd7b7b490e3aefe46f3cc41ebdc8f0024f665d3 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 29 Aug 2017 21:21:00 +0000 Subject: [PATCH] Bug 19180: [FOLLOW-UP] Renaming all instances of 'name' variable to 'booksellername' ... when referring to the name of the vendor. To test: 1) Confirm vendor shows on webpage title (tab name) 2) Confirm vendor shows in breadcrumbs 3) Confirm vendor shows in heading when viewing basket ('Basket x (1) for vendor') Sponsored-by: Catalyst IT --- acqui/basket.pl | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 11 +++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/acqui/basket.pl b/acqui/basket.pl index 09a76d5..1f97d18 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -101,7 +101,7 @@ unless (CanUserManageBasket($loggedinuser, $basket, $userflags)) { basketno => $basketno, basketname => $basket->{basketname}, booksellerid => $booksellerid, - name => $bookseller->name, + booksellername => $bookseller->name, ); output_html_with_http_headers $query, $cookie, $template->output; exit; @@ -160,7 +160,7 @@ if ( $op eq 'delete_confirm' ) { DelBasket($basketno,); $template->param( delete_confirmed => 1, - name => $bookseller->name, + booksellername => $bookseller->name, booksellerid => $booksellerid, ); } elsif ( !$bookseller ) { @@ -220,7 +220,7 @@ if ( $op eq 'delete_confirm' ) { $template->param( confirm_close => "1", booksellerid => $booksellerid, - name => $bookseller->name, + booksellername => $bookseller->name, basketno => $basket->{'basketno'}, basketname => $basket->{'basketname'}, basketgroupname => $basket->{'basketname'}, @@ -411,7 +411,7 @@ if ( $op eq 'list' ) { billingplace => $basket->{billingplace}, active => $bookseller->active, booksellerid => $bookseller->id, - name => $bookseller->name, + booksellername => $bookseller->name, books_loop => \@books_loop, book_foot_loop => \@book_foot_loop, cancelledorders_loop => \@cancelledorders_loop, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index aea00a3..cfc280a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -18,8 +18,7 @@ [% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno |html %]) for [% name|html %] - +Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno |html %]) for [% booksellername|html %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] @@ -196,8 +195,8 @@
@@ -341,7 +340,7 @@
Click here to go back to booksellers page [% ELSE %] - Show baskets for vendor [% name | html %] Show all active baskets + Show baskets for vendor [% booksellername | html %] Show all active baskets [% END %] [% ELSE %] @@ -361,7 +360,7 @@ [% END %] [% END %] -

[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno |html %]) for [% name|html %]

+

[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno |html %]) for [% booksellername|html %]

[% IF ( basketno ) %]
-- 2.1.4