316eda1036
There are several notes and other fields in a subscription that can be entered as multi-line input with breaks. We should display them as they were entered with keeping the line breaks intact. To test: - Add a subscription - Add comments including line breaks in internal and OPAC note - Check the manual history checkbox - Go to the subscription detail page, tab 'Planning' - Use the 'Edit history' link to edit the history - Enter content with line breaks in all the input fields where it's possible - Go to the OPAC detail page for your subscription record - Go to tab 'Subscriptions' > More details > Brief history - Verify the line breaks show there as <br> - Apply patch - Relaod page, verify all information displays correctly now - Go back to the detail page, subscription tab - verify same there - Go back to the subscription detail page in staff - Check editing the history works as expected - Verify information on all tabs displays correctly - Receive a serial issue - verify note on top displays right - Go to the serial collection page of the subscription - same there Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Nadine Pierre <nadine.pierre@inLibro.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
114 lines
3.8 KiB
Perl
Executable file
114 lines
3.8 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2000-2002 Katipo Communications
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
|
|
use Modern::Perl;
|
|
|
|
use CGI qw ( -utf8 );
|
|
use C4::Auth;
|
|
use C4::Koha;
|
|
use C4::Serials;
|
|
use C4::Letters;
|
|
use C4::Output;
|
|
use C4::Context;
|
|
|
|
my $query = new CGI;
|
|
my $op = $query->param('op');
|
|
my $dbh = C4::Context->dbh;
|
|
my $selectview = $query->param('selectview');
|
|
$selectview = C4::Context->preference("SubscriptionHistory") unless $selectview;
|
|
|
|
my $sth;
|
|
|
|
# my $id;
|
|
my ( $template, $loggedinuser, $cookie );
|
|
my $biblionumber = $query->param('biblionumber');
|
|
if ( $selectview eq "full" ) {
|
|
( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "opac-full-serial-issues.tt",
|
|
query => $query,
|
|
type => "opac",
|
|
authnotrequired => 1,
|
|
debug => 1,
|
|
}
|
|
);
|
|
my $subscriptions = GetFullSubscriptionsFromBiblionumber($biblionumber);
|
|
my $subscriptioninformation=PrepareSerialsData($subscriptions);
|
|
# PrepareSerialsData does some bogus stuff that the template could handle
|
|
# But at least it sorts the array by the year field so we dont have to
|
|
# find 'manage' if its there
|
|
if ($subscriptioninformation->[0]->{year} eq 'manage') {
|
|
shift @{$subscriptioninformation};
|
|
}
|
|
|
|
# now, check is there is an alert subscription for one of the subscriptions
|
|
if ($loggedinuser) {
|
|
foreach (@$subscriptions) {
|
|
my $subscription = Koha::Subscriptions->find( $_->{subscriptionid} );
|
|
my $subscriber = $subscription->subscribers->find( $loggedinuser );
|
|
$_->{hasalert} = 1 if $subscriber;
|
|
}
|
|
}
|
|
|
|
my $title = $subscriptions->[0]->{bibliotitle};
|
|
my $yearmin = $subscriptions->[0]->{year};
|
|
my $yearmax = $subscriptions->[ -1 ]->{year};
|
|
|
|
$template->param(
|
|
biblionumber => scalar $query->param('biblionumber'),
|
|
years => $subscriptioninformation,
|
|
yearmin => $yearmin,
|
|
yearmax => $yearmax,
|
|
bibliotitle => $title,
|
|
suggestion => C4::Context->preference("suggestion"),
|
|
virtualshelves => C4::Context->preference("virtualshelves"),
|
|
);
|
|
|
|
}
|
|
else {
|
|
( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "opac-serial-issues.tt",
|
|
query => $query,
|
|
type => "opac",
|
|
authnotrequired => 1,
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
my $subscriptions = GetSubscriptionsFromBiblionumber($biblionumber);
|
|
# now, check is there is an alert subscription for one of the subscriptions
|
|
if ($loggedinuser) {
|
|
foreach (@$subscriptions) {
|
|
my $subscription = Koha::Subscriptions->find( $_->{subscriptionid} );
|
|
my $subscriber = $subscription->subscribers->find( $loggedinuser );
|
|
$_->{hasalert} = 1 if $subscriber;
|
|
}
|
|
}
|
|
|
|
my $title = $subscriptions->[0]->{bibliotitle};
|
|
|
|
$template->param(
|
|
biblionumber => scalar $query->param('biblionumber'),
|
|
subscription_LOOP => $subscriptions,
|
|
bibliotitle => $title,
|
|
);
|
|
}
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|