From b366d8d4de2adae265fab1313e7bd2aad3fe67aa Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 17 Apr 2018 18:14:22 -0300 Subject: [PATCH] Bug 18426: Address QA issues - Replaced with the "action" links we already have on the biblio detail page and the items lost report. - Display all the editable values in the table - Add a 'Cancel' link Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../prog/en/modules/serials/serials-search.tt | 64 ++++++++++++++++--- .../modules/serials/subscription-batchedit.tt | 25 ++++++-- 2 files changed, 74 insertions(+), 15 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt index 7ee6e709a2..18364bc4f1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt @@ -17,23 +17,31 @@ +[% url_params = [] %] +[% FOREACH param IN CGI.params.pairs %] + [% escaped_value = BLOCK %][% param.value | uri %][% END %] + [% url_params.push(param.key _ '=' _ escaped_value) %] +[% END %] +[% SET referrer = '/cgi-bin/koha/serials/serials-search.pl?' %] +[% referrer = BLOCK %][% referrer | url %][% url_params.join("&") |uri %][% END %] +[% SET edit_action_link = '/cgi-bin/koha/serials/subscription-batchedit.pl?referrer=' _ referrer %] [% BLOCK subscriptions_table %]
- [% url_params = [] %] - [% FOREACH param IN CGI.params.pairs %] - [% escaped_value = BLOCK %][% param.value | uri %][% END %] - [% url_params.push(param.key _ '=' _ escaped_value) %] + [% IF closed %] + [% SET tab = 'closed' %] + [% ELSE %] + [% SET tab = 'opened' %] [% END %] - - @@ -392,6 +400,32 @@ [% Asset.js("js/serials-toolbar.js") %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt index b53cb07c75..ccd899a141 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt @@ -32,10 +32,14 @@ - - + + + + + + @@ -44,10 +48,20 @@ - - + + + + + + [% END %] @@ -140,7 +154,8 @@
- + + Cancel
-- 2.39.5
ISSN TitleNotesLibraryVendor LocationLibraryItem typePublic notesNonpublic notes Call numberCreate item when receiving Expiration date
[% subscription.biblio.biblioitem.issn %] [% subscription.biblio.title %] (#[% subscription.subscriptionid %])[% subscription.notes %] [% IF subscription.internalnotes %]([% subscription.internalnotes %])[% END %][% Branches.GetName(subscription.branchcode) %][% subscription.vendor.name |html %] [% AuthorisedValues.GetByCode('LOC', subscription.location) %][% Branches.GetName(subscription.branchcode) %][% ItemTypes.GetDescription( subscription.itemtype ) %][% subscription.notes %][% subscription.internalnotes %] [% subscription.callnumber %] + [% IF subscription.serialsadditems %] + Yes + [% ELSE %] + No + [% END %] + [% subscription.enddate | $KohaDates %]