Bugzilla – Attachment 60449 Details for
Bug 10978
redirect to basket list of a supplier after deleting a basket
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10978: Redirect to basket list of a supplier after deleting a basket
Bug-10978-Redirect-to-basket-list-of-a-supplier-af.patch (text/plain), 4.50 KB, created by
Jonathan Druart
on 2017-02-20 08:42:35 UTC
(
hide
)
Description:
Bug 10978: Redirect to basket list of a supplier after deleting a basket
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2017-02-20 08:42:35 UTC
Size:
4.50 KB
patch
obsolete
>From 1e5cb5530618f3a6d6d11b06383c728401ea0664 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Wed, 15 Feb 2017 00:30:57 +0000 >Subject: [PATCH] Bug 10978: Redirect to basket list of a supplier after > deleting a basket >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >This patch redirects to the vendor's list of baskets after deleting a >basket, fixes breadcrumbs after deletion and also hides the toolbar >actions after deletion (seeing as you can't edit/export etc a basket >that no longer exists). > >To test: >1) Go to Acquisitions -> find a vendor -> view a basket or create a new >basket >2) Delete the basket. Notice you are taken to a list of all vendors and >baskets >3) Apply patch and do step 1 again >4) Delete the basket. Notice appropriate breadcrumbs, no toolbar, and >confirm link to return to baskets for the vendor works. > >Sponsored-by: Catalyst IT > >Followed test plan, works as expected (links to vendor's baskets and all baskets) >Signed-off-by: Marc Véron <veron@veron.ch> > >Re-tested. Wording of buttons "Show baskets for vendor..." and "Show all >active baskets" makes sense. >Signed-off-by: Marc Véron <veron@veron.ch> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > acqui/basket.pl | 6 +++++- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 11 +++++++++-- > 2 files changed, 14 insertions(+), 3 deletions(-) > >diff --git a/acqui/basket.pl b/acqui/basket.pl >index 31b96bb..284b082 100755 >--- a/acqui/basket.pl >+++ b/acqui/basket.pl >@@ -156,7 +156,11 @@ if ( $op eq 'delete_confirm' ) { > } > # delete the basket > DelBasket($basketno,); >- $template->param( delete_confirmed => 1 ); >+ $template->param( >+ delete_confirmed => 1, >+ name => $bookseller->name, >+ booksellerid => $booksellerid, >+ ); > } elsif ( !$bookseller ) { > $template->param( NO_BOOKSELLER => 1 ); > } elsif ($op eq 'export') { >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 43af8be..bfbfdb2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt >@@ -167,7 +167,12 @@ > [% 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?booksellerid=[% booksellerid %]">[% name|html %]</a> › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]</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?booksellerid=[% booksellerid %]">[% name|html %]</a> › >+ [% UNLESS ( basketno ) %][% IF ( delete_confirmed ) %]Deleted [% ELSE %]New [% END %][% END %]Basket [% basketname|html %] [% IF ( basketno ) %]([% basketno %])[% END %] for [% name|html %] >+</div> > > <div id="doc3" class="yui-t2"> > >@@ -182,6 +187,7 @@ > [% IF !confirm_close && !edi_confirm %] > [% UNLESS ( selectbasketg ) %] > [% UNLESS ( closedate ) %] >+ [% UNLESS ( delete_confirmed ) %] > <div id="toolbar" class="btn-toolbar"> > [% IF active %] > <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-default btn-sm" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></div> >@@ -211,6 +217,7 @@ > </div> > [% END %] > </div> >+ [% END %] > <!-- Modal for confirm deletion box--> > <div class="modal" id="deleteBasketModal" tabindex="-1" role="dialog" aria-labelledby="delbasketModalLabel" aria-hidden="true"> > <div class="modal-dialog"> >@@ -301,7 +308,7 @@ > </div> > <a href="booksellers.pl">Click here to go back to booksellers page</a> > [% ELSE %] >- <META HTTP-EQUIV=Refresh CONTENT="0; url=booksellers.pl"> >+ <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> > [% END %] > [% ELSE %] > >-- >2.9.3
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 10978
:
60227
|
60283
|
60293
|
60365
|
60371
| 60449