From 66f35dc7366a879b8efc6cf8138fce04a4cd0990 Mon Sep 17 00:00:00 2001 From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Date: Mon, 13 Jan 2020 12:04:46 +0100 Subject: [PATCH] Bug 23031: Make 'add to basket' accessible in one click (fix regression) Since bug 21364 we have 'view' then 'add to basket' that is accessible in 2 clicks. We should have it directly accessible. Test plan: Create a new basket Add a new order to the basket (note that the link is directly accessible) When a new order is added you can close the basket from the basket list view Note that the dropdown button displays correctly Signed-off-by: Owen Leonard <oleonard@myacpl.org> --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index 512eed7015e..01a4ae94516 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -144,12 +144,12 @@ </td> <td class="actions"> [% IF not basket.closedate and supplier.active %] + [% IF basket.uncertainprices OR ( basket.total_items && !basket.is_standing ) %] <div class="dropup"> <div class="btn-group"> [%# There should be no space between these two buttons, it would render badly %] - <a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]"><i class="fa fa-eye"></i> View</a><a class="btn btn-default btn-xs dropdown-toggle" id="basketactions[% basket.basknetno | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a> + <a class="btn btn-default btn-xs" id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a><a class="btn btn-default btn-xs dropdown-toggle" id="basketactions[% basket.basknetno | html %]" role="button" data-toggle="dropdown" href="#"><b class="caret"></b></a> <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="basketactions[% basketn.basketno | html %]"> - <li><a id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a></li> [% IF basket.uncertainprices %] <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=[% basket.booksellerid | uri %]&owner=1"><i class="fa fa-usd"></i> Uncertain prices</a></li> [% ELSIF basket.total_items && !basket.is_standing %] @@ -169,8 +169,9 @@ </div> </div> </div> - [% ELSE %] - <a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]"><i class="fa fa-eye"></i> View</a> + [% ELSE %] + <a class="btn btn-default btn-xs" id="addtoBasketLabel[% basket.basketno | html %]" href="#addtoBasket[% basket.basketno | html %]" role="button" data-toggle="modal"><i class="fa fa-plus"></i> Add to basket</a> + [% END %] [% END %] </td> </tr> -- 2.11.0