From ac5d5090f967ece92244280b47bc75ed7c19536b Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 17 Oct 2012 10:19:01 +0200 Subject: [PATCH] Bug 8782: Followup: add some minor modifications - Show 'closed' information in biblio detail page - Add a column in serials report table - Search subscriptions on title words instead of string - Prevent serials editing when subscription is closed - Don't change status of "disabled" serials --- C4/Serials.pm | 12 ++++++++++-- catalogue/detail.pl | 2 ++ .../intranet-tmpl/prog/en/modules/catalogue/detail.tt | 2 ++ .../intranet-tmpl/prog/en/modules/reports/serials_stats.tt | 8 ++++++++ .../intranet-tmpl/prog/en/modules/serials/serials-edit.tt | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 2 ++ opac/opac-detail.pl | 2 ++ reports/serials_stats.pl | 3 ++- serials/serials-edit.pl | 1 + 9 files changed, 30 insertions(+), 4 deletions(-) diff --git a/C4/Serials.pm b/C4/Serials.pm index 76aae10..0c4b60e 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -670,8 +670,16 @@ sub SearchSubscriptions { push @where_args, $args->{biblionumber}; } if( $args->{title} ){ - push @where_strs, "biblio.title LIKE ?"; - push @where_args, "%$args->{title}%"; + my @words = split / /, $args->{title}; + my (@strs, @args); + foreach my $word (@words) { + push @strs, "biblio.title LIKE ?"; + push @args, "%$word%"; + } + if (@strs) { + push @where_strs, '(' . join (' AND ', @strs) . ')'; + push @where_args, @args; + } } if( $args->{issn} ){ push @where_strs, "biblioitems.issn LIKE ?"; diff --git a/catalogue/detail.pl b/catalogue/detail.pl index 67e9c99..162530f 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -155,6 +155,8 @@ foreach my $subscription (@subscriptions) { $cell{branchcode} = $subscription->{branchcode}; $cell{branchname} = GetBranchName($subscription->{branchcode}); $cell{hasalert} = $subscription->{hasalert}; + $cell{callnumber} = $subscription->{callnumber}; + $cell{closed} = $subscription->{closed}; #get the three latest serials. $serials_to_display = $subscription->{staffdisplaycount}; $serials_to_display = C4::Context->preference('StaffSerialIssueDisplayCount') unless $serials_to_display; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index f6a2ea9..0e3313a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -470,6 +470,8 @@ function verify_images() { [% FOREACH subscription IN subscriptions %] [% IF ( subscription.branchname ) %]

At library: [% subscription.branchname %]

[% ELSE %] [% IF ( subscription.branchcode ) %]

At library: [% subscription.branchcode %]

[% END %][% END %] + [% IF ( subscription.closed ) %]

This subscription is closed.

[% END %] + [% IF ( subscription.callnumber ) %]

Callnumber: [% subscription.callnumber %]

[% END %] [% IF ( subscription.subscriptionnotes ) %]

[% subscription.subscriptionnotes FILTER html_line_break %]

[% END %] [% IF ( subscription.missinglist ) %]

Missing issues: [% subscription.missinglist %]

[% END %] [% IF ( subscription.librariannote ) %]

([% subscription.librariannote %])

[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt index af51a4c..65f662f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt @@ -38,6 +38,7 @@ Call number Subscription begin Subscription end + Expired? / Closed? @@ -50,6 +51,13 @@ [% data.callnumber %] [% data.startdate %] [% data.enddate %] + + [% IF data.closed %] + Closed + [% ELSIF data.expired %] + Expired + [% END %] + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt index 75f32ea..cc08add 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt @@ -230,7 +230,7 @@ $(document).ready(function() { [% IF ( serialslis.editdisable ) %] - +