Bugzilla – Attachment 67156 Details for
Bug 19180
Vendor name is missing from breadcrumbs when closing an order
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19180: [FOLLOW-UP] Renaming all instances of 'name' variable to 'booksellername'
Bug-19180-FOLLOW-UP-Renaming-all-instances-of-name.patch (text/plain), 5.46 KB, created by
Caroline Cyr La Rose
on 2017-09-15 19:30:01 UTC
(
hide
)
Description:
Bug 19180: [FOLLOW-UP] Renaming all instances of 'name' variable to 'booksellername'
Filename:
MIME Type:
Creator:
Caroline Cyr La Rose
Created:
2017-09-15 19:30:01 UTC
Size:
5.46 KB
patch
obsolete
>From d1adb95bdb4ad453ca6ba0b9f5d0b6773b99de07 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >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 > >Signed-off-by: Mark Tompsett <mtompset@hotmail.com> >Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com> >--- > acqui/basket.pl | 8 ++++---- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 10 +++++----- > 2 files changed, 9 insertions(+), 9 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..eb382ad 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -18,7 +18,7 @@ > [% USE AuthorisedValues %] > > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno |html %]) for [% name|html %]</title> >+<title>Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno |html %]) for [% booksellername|html %]</title> > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] >@@ -196,8 +196,8 @@ > <div id="breadcrumbs"> > <a href="/cgi-bin/koha/mainpage.pl">Home</a> › > <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › >- <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name|html %]</a> › >- [% UNLESS ( basketno ) %][% IF ( delete_confirmed ) %]Deleted [% ELSE %]New [% END %][% END %]Basket [% basketname|html %] [% IF ( basketno ) %]([% basketno |html %])[% END %] for [% name|html %] >+ <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername|html %]</a> › >+ [% UNLESS ( basketno ) %][% IF ( delete_confirmed ) %]Deleted [% ELSE %]New [% END %][% END %]Basket [% basketname|html %] [% IF ( basketno ) %]([% basketno |html %])[% END %] for [% booksellername|html %] > </div> > > <div id="doc3" class="yui-t2"> >@@ -341,7 +341,7 @@ > </div> > <a href="booksellers.pl">Click here to go back to booksellers page</a> > [% ELSE %] >- <a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]" class="btn btn-default btn-sm">Show baskets for vendor [% name | html %]</a> <a href="/cgi-bin/koha/acqui/booksellers.pl" class="btn btn-default btn-sm">Show all active baskets</a> >+ <a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]" class="btn btn-default btn-sm">Show baskets for vendor [% booksellername | html %]</a> <a href="/cgi-bin/koha/acqui/booksellers.pl" class="btn btn-default btn-sm">Show all active baskets</a> > [% END %] > [% ELSE %] > >@@ -361,7 +361,7 @@ > [% END %] > </div> > [% END %] >- <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno |html %]) for <a href="supplier.pl?booksellerid=[% booksellerid %]">[% name|html %]</a></h1> >+ <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno |html %]) for <a href="supplier.pl?booksellerid=[% booksellerid %]">[% booksellername|html %]</a></h1> > [% IF ( basketno ) %] > <div id="acqui_basket_summary" class="yui-g"> > <div class="rows"> >-- >1.9.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 19180
:
66517
|
66562
|
66603
|
67029
|
67030
|
67031
|
67032
|
67156
|
67213
|
67214