From 7444b82fedeeab312aaf9efe45abdaff4f097eff Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 3 Sep 2012 11:44:21 +0200 Subject: [PATCH] Bug 8715: Receive all serials for a year. This patch adds - 2 links in the table header (select all and clear all). - Datatable on these tables Test plan: Try to select all serials for a year and receive them. Test there is no regression (ergonomic) on this page Signed-off-by: Owen Leonard Bug 8715 [Follow-up] Receiving all serials for a year Follow-up: For consistency, I would prefer to have the column of checkboxes at the beginning of the table and the select/clear links above. Signed-off-by: Jonathan Druart Bug 8715: Force the default sort order to desc Signed-off-by: Paul Poulain Signed-off-by: Jared Camins-Esakov --- .../en/modules/serials/serials-collection.tt | 82 +++++++++++++------ serials/serials-collection.pl | 1 + 2 files changed, 59 insertions(+), 24 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt index 3d2e690037..94b10cc3f4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -1,6 +1,10 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Serials › Serial collection information for [% bibliotitle %] + [% INCLUDE 'doc-head-close.inc' %] + + + @@ -198,9 +223,16 @@ $(document).ready(function() { [% IF ( subscriptions.size == 1 and !serialsadditems ) %] [% END %]

[% END %] - - - + + Select all + | + + Clear all + +
+ + + [% IF ( CAN_user_serials_receive_serials ) %][% END %] [% IF ( subscriptions.size > 1 ) %] [% END %] @@ -217,10 +249,28 @@ $(document).ready(function() { [% IF ( routing ) %][% END %] - [% IF ( CAN_user_serials_receive_serials ) %][% END %] + + [% FOREACH serial IN year.serials %] [% UNLESS ( loop.odd ) %][% ELSE %][% END %] + [% IF ( CAN_user_serials_receive_serials ) %] + + [% END %] [% IF ( subscriptions.size > 1 ) %] [% END %] @@ -247,26 +297,10 @@ $(document).ready(function() { Print list [% END %] - [% IF ( CAN_user_serials_receive_serials ) %] - - [% END %] - [% END %] -
Edit# SubsLibrary RoutingEdit
+ [% IF ( serial.cannotedit ) %] + disabled + [% ELSE %] + [% IF ( serial.subscriptionexpired ) %] + + [% ELSE %] + [% IF ( serial.checked ) %] + + [% ELSE %] + + [% END %] + [% END %] + [% END %] + [% serial.subscriptionid %] - [% IF ( serial.cannotedit ) %] - disabled - [% ELSE %] - [% IF ( serial.subscriptionexpired ) %] - - [% ELSE %] - [% IF ( serial.checked ) %] - - [% ELSE %] - - [% END %] - [% END %] - [% END %] -
+ [% END %] + + [% END %] diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl index 43935467a6..470e10d346 100755 --- a/serials/serials-collection.pl +++ b/serials/serials-collection.pl @@ -169,6 +169,7 @@ $template->param( callnumber => $callnumber, uc(C4::Context->preference("marcflavour")) => 1, serialsadditems => $subscriptiondescs->[0]{'serialsadditems'}, + dateformatmetric => C4::Context->preference("dateformat") eq "metric" ? 1 : 0, ); output_html_with_http_headers $query, $cookie, $template->output; -- 2.39.5