Bugzilla – Attachment 88983 Details for
Bug 21364
Allow closing basket from vendor search/view
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21364: (QA follow-up) Fix QA script complaints (tabs and filters)
Bug-21364-QA-follow-up-Fix-QA-script-complaints-ta.patch (text/plain), 6.93 KB, created by
Katrin Fischer
on 2019-04-27 13:58:44 UTC
(
hide
)
Description:
Bug 21364: (QA follow-up) Fix QA script complaints (tabs and filters)
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2019-04-27 13:58:44 UTC
Size:
6.93 KB
patch
obsolete
>From 8b7a2d6fd307e85228bec749719fc4c9fa281498 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >Date: Sat, 27 Apr 2019 13:42:17 +0000 >Subject: [PATCH] Bug 21364: (QA follow-up) Fix QA script complaints (tabs and > filters) > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > C4/Acquisition.pm | 2 +- > .../intranet-tmpl/prog/en/modules/acqui/booksellers.tt | 16 ++++++++-------- > 2 files changed, 9 insertions(+), 9 deletions(-) > >diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm >index 6f0f678aa9..38bb24186b 100644 >--- a/C4/Acquisition.pm >+++ b/C4/Acquisition.pm >@@ -685,7 +685,7 @@ sub GetBasketsInfosByBookseller { > , aqorders.quantity > , 0) > ) AS expected_items, >- SUM( aqorders.uncertainprice ) AS uncertainprices >+ SUM( aqorders.uncertainprice ) AS uncertainprices > FROM aqbasket > LEFT JOIN aqorders ON aqorders.basketno = aqbasket.basketno > WHERE booksellerid = ?}; >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 024c95ffe2..512eed7015 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt >@@ -60,21 +60,21 @@ > [% END %] > <span class="suppliername"> > [% IF (supplier.name) %] >- <a name="[% supplier.booksellerid | html %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid | html %]">[% supplier.name | html %]</a> >+ <a name="[% supplier.booksellerid | html %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid | uri %]">[% supplier.name | html %]</a> > [% ELSE %] >- <a name="[% supplier.booksellerid | html %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid | html %]">NO NAME</a> >+ <a name="[% supplier.booksellerid | html %]" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% supplier.booksellerid | uri %]">NO NAME</a> > [% END %] > </span> > <span class="action"> > [% IF ( CAN_user_acquisition_order_manage ) %] > [% IF ( supplier.active ) %] >- <a class="btn btn-default btn-sm" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid | html %]&op=add_form"><i class="fa fa-plus"></i> New basket</a> >+ <a class="btn btn-default btn-sm" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid | uri %]&op=add_form"><i class="fa fa-plus"></i> New basket</a> > [% ELSE %] > (inactive) > [% END %] > [% END %] > [% IF ( supplier.loop_basket.size ) %] >- <a class="btn btn-default btn-sm" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% supplier.booksellerid | html %]"><i class="fa fa-inbox"></i> Receive shipment</a> >+ <a class="btn btn-default btn-sm" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% supplier.booksellerid | uri %]"><i class="fa fa-inbox"></i> Receive shipment</a> > [% END %] > </span> > <div class="baskets"> >@@ -102,7 +102,7 @@ > <tr> > [% END %] > <td>[% basket.basketno | html %]</td> >- <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | html %]">[% basket.basketname | html %]<a></td> >+ <td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno | uri %]">[% basket.basketname | html %]<a></td> > <td> > <span title="[% basket.total_items | html %]">[% basket.total_items | html %] > [% IF basket.total_items_cancelled %] >@@ -147,13 +147,13 @@ > <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 | html %]"><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" 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> > <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 | html %]&owner=1"><i class="fa fa-usd"></i> Uncertain prices</a></li> >+ <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 %] >- <li><a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basket.basketno | html %]&booksellerid=[% basket.booksellerid | html %]"><i class="fa fa-times-circle"></i> Close this basket</a></li> >+ <li><a href="/cgi-bin/koha/acqui/basket.pl?op=close&basketno=[% basket.basketno | uri %]&booksellerid=[% basket.booksellerid | uri %]"><i class="fa fa-times-circle"></i> Close this basket</a></li> > [% END %] > </ul> > <!-- Modal --> >-- >2.11.0
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 21364
:
79015
|
79019
|
79069
|
79106
|
79121
|
79470
|
88393
|
88787
|
88788
|
88847
|
88848
|
88982
| 88983