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> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
parent
c172c8ff6e
commit
1132889dc9
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue