From 55b280efebc3ca4a2dbc086de7c0cb5078041c10 Mon Sep 17 00:00:00 2001 From: Michal Urban Date: Tue, 21 Jun 2022 05:52:58 -0400 Subject: [PATCH] Bug 10086: No way to go back to the basket on uncertain prices page Fixed the edit button placement to the right-most column and fixed the the displayed information in the order column from calling non-existent variables based on the item. To test: 1) Add an item with uncertain prices to a basket 2) Go to the vendor of the basket 3) Click Uncertain prices on the left 4) Notice 'edit' button does not look like a button, and basket name is not a link 5) Apply patch and refresh page 6) Basket name is now a link. Click to confirm it takes you to the right page 7) Edit button is now in edit column. Confirm it works as expected 8) Confirm you cannot sort on Edit column and the button does not wrap on a narrower browser 9) Check that the correct information is displayed for the order column (title, author, publisher code, publication year, copyright date, isbn) --- .../prog/en/modules/acqui/uncertainprice.tt | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt index c10c1fed5e..3db3078b01 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -122,11 +122,11 @@ var MSG_INVALIDPRICE = _("ERROR: Price is not a valid number, please check the p Basket Order - Edit By Uncertain Price Quantity + Edit @@ -136,10 +136,15 @@ var MSG_INVALIDPRICE = _("ERROR: Price is not a valid number, please check the p [% uncertainpriceorder.basketname %] - [% uncertainpriceorder.bibtitle %] / [% uncertainpriceorder.bibauthor %]
[% uncertainpriceorder.bibpublishercode %], [% uncertainpriceorder.bibpublicationyear %]
[% uncertainpriceorder.bibisbn %] - - - Edit + [% uncertainpriceorder.title | html %] + [% IF ( uncertainpriceorder.author ) %] by [% uncertainpriceorder.author | html %][% END %] + [% IF ( uncertainpriceorder.publishercode ) %] +
Publisher: [% uncertainpriceorder.publishercode | html %] + [%- IF ( uncertainpriceorder.publicationyear ) -%], [% uncertainpriceorder.publicationyear | html %] + [%- ELSIF ( uncertainpriceorder.copyrightdate ) -%] [% uncertainpriceorder.copyrightdate | html %] + [% END %] + [% END %] + [% IF ( uncertainpriceorder.isbn ) %]
[% uncertainpriceorder.isbn | html %][% END %] [% uncertainpriceorder.firstname | html %] [% uncertainpriceorder.surname | html %] @@ -158,6 +163,9 @@ var MSG_INVALIDPRICE = _("ERROR: Price is not a valid number, please check the p [% END %] + + Edit + [% END %] -- 2.25.1