Bugzilla – Attachment 4002 Details for
Bug 5445
Acq: No way back to order from z39.50 result page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
proposed patch fixing variable names in multiple sample files
0001-Bug-5445-Nicer-breadcrumbs-when-ordering-from-differ.patch (text/plain), 5.61 KB, created by
Katrin Fischer
on 2011-04-25 20:51:42 UTC
(
hide
)
Description:
proposed patch fixing variable names in multiple sample files
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2011-04-25 20:51:42 UTC
Size:
5.61 KB
patch
obsolete
>From da19fa993fa16c0d1cc3b6738d0eef5ba91b3666 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <Katrin.Fischer.83@web.de> >Date: Mon, 25 Apr 2011 22:47:08 +0200 >Subject: [PATCH] Bug 5445: Nicer breadcrumbs when ordering from different sources >Content-Type: text/plain; charset="utf-8" > >While it was possible to go back to vendor and basket page when ordering >from a new suggestion the other odering options missed those 'crumbs'. > >This patch makes the breadcrumbs for all orderings options consistent and >makes it possible to navigate back to the vendor or basket from all >pages. >--- > acqui/z3950_search.pl | 8 +++++++- > .../prog/en/modules/acqui/addorderiso2709.tt | 2 +- > .../prog/en/modules/acqui/neworderempty.tt | 2 +- > .../prog/en/modules/acqui/z3950_search.tt | 2 +- > 4 files changed, 10 insertions(+), 4 deletions(-) > >diff --git a/acqui/z3950_search.pl b/acqui/z3950_search.pl >index b0a8b92..47dbe52 100755 >--- a/acqui/z3950_search.pl >+++ b/acqui/z3950_search.pl >@@ -30,6 +30,7 @@ use C4::Context; > use C4::Breeding; > use C4::Koha; > use C4::Charset; >+use C4::Bookseller qw/ GetBookSellerFromId /; > use ZOOM; > > my $input = new CGI; >@@ -44,6 +45,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > } > ); > >+ > my $dbh = C4::Context->dbh; > my $error = $input->param('error'); > my $biblionumber = $input->param('biblionumber'); >@@ -102,10 +104,14 @@ foreach my $thisframeworkcode ( keys %$frameworks ) { > push @frameworkcodeloop, \%row; > } > >+my $vendor = GetBookSellerFromId($booksellerid); > $template->param( frameworkcode => $frameworkcode, > frameworkcodeloop => \@frameworkcodeloop, > booksellerid => $booksellerid, >- basketno => $basketno); >+ basketno => $basketno, >+ name => $vendor->{'name'} >+ ); >+ > > > if ( $op ne "do_search" ) { >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 e10e297..04d0c58 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -24,7 +24,7 @@ > <body> > [% INCLUDE 'header.inc' %] > [% INCLUDE 'acquisitions-search.inc' %] >-<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?supplierid=[% booksellerid %]">[% booksellername %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket #[% basketno %]</a> › Add orders from iso2709 file</div> >+<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?supplierid=[% booksellerid %]">[% booksellername %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> › Add orders from iso2709 file</div> > <div id="doc3" class="yui-t2"> > <div id="bd"> > <div id="yui-main"> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >index 7abe043..d6c8459 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt >@@ -110,7 +110,7 @@ $(document).ready(function() > [% INCLUDE 'header.inc' %] > [% INCLUDE 'acquisitions-search.inc' %] > >-<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/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> › [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber %])[% ELSE %]New order[% END %]</div> >+<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?supplierid=[% booksellerid %]">[% name %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> › [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber %])[% ELSE %]New order[% END %]</div> > > <div id="doc3" class="yui-t2"> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >index ca52536..bbcb973 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt >@@ -63,7 +63,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : > [% INCLUDE 'header.inc' %] > [% INCLUDE 'acquisitions-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › Order from Z39.50 search</div> >+<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?supplierid=[% booksellerid %]">[% name %]</a> › <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Basket [% basketno %]</a> › Order from Z39.50 search</div> > <div id="doc3" class="yui-t7"> > <div id="bd"> > [% IF ( opsearch ) %] >-- >1.7.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 5445
:
2787
|
4002
|
4003