View | Details | Raw Unified | Return to bug 23126
Collapse All | Expand All

(-)a/C4/Serials.pm (-3 lines)
Lines 429-437 sub GetSubscriptionsFromBiblionumber { Link Here
429
            $subs->{histenddate} = "";
429
            $subs->{histenddate} = "";
430
        }
430
        }
431
        $subs->{opacnote}     //= "";
431
        $subs->{opacnote}     //= "";
432
        $subs->{opacnote}     =~ s/\n/\<br\/\>/g;
433
        $subs->{missinglist}  =~ s/\n/\<br\/\>/g;
434
        $subs->{recievedlist} =~ s/\n/\<br\/\>/g;
435
        $subs->{ "periodicity" . $subs->{periodicity} }     = 1;
432
        $subs->{ "periodicity" . $subs->{periodicity} }     = 1;
436
        $subs->{ "numberpattern" . $subs->{numberpattern} } = 1;
433
        $subs->{ "numberpattern" . $subs->{numberpattern} } = 1;
437
        $subs->{ "status" . $subs->{'status'} }             = 1;
434
        $subs->{ "status" . $subs->{'status'} }             = 1;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt (-1 / +1 lines)
Lines 53-59 Link Here
53
        <td>[% subscription.numberpattern.label | html %]</td>
53
        <td>[% subscription.numberpattern.label | html %]</td>
54
        <td>[% IF subscription.branchcode %][% Branches.GetName( subscription.branchcode ) | html %][% END %]</td>
54
        <td>[% IF subscription.branchcode %][% Branches.GetName( subscription.branchcode ) | html %][% END %]</td>
55
        <td> [% subscription.callnumber | html %]</td>
55
        <td> [% subscription.callnumber | html %]</td>
56
        <td> [% subscription.notes | html %]
56
        <td> [% subscription.notes | html | html_line_break %]
57
            [% UNLESS subscription.closed %]
57
            [% UNLESS subscription.closed %]
58
                [% IF ( subscription.subscriptionexpired ) %]
58
                [% IF ( subscription.subscriptionexpired ) %]
59
                    <br /><span class="problem"> Subscription expired</span>
59
                    <br /><span class="problem"> Subscription expired</span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt (-1 / +1 lines)
Lines 95-101 $(document).ready(function() { Link Here
95
<h1>Serial edition <i>[% bibliotitle | html %]</i>
95
<h1>Serial edition <i>[% bibliotitle | html %]</i>
96
    [% IF location %] ([% AuthorisedValues.GetByCode('LOC', location) | html %])[% END %]
96
    [% IF location %] ([% AuthorisedValues.GetByCode('LOC', location) | html %])[% END %]
97
    [% IF ( callnumber ) %] callnumber: [% callnumber | html %][% END %]</h1>
97
    [% IF ( callnumber ) %] callnumber: [% callnumber | html %][% END %]</h1>
98
[% IF internalnotes %]<p>Nonpublic note: [% internalnotes | html %]</p>[% END %]
98
[% IF internalnotes %]<p>Nonpublic note: [% internalnotes | html | html_line_break %]</p>[% END %]
99
<form method="post" name="f" class="noEnterSubmit" action="serials-edit.pl" id="serials_edit">
99
<form method="post" name="f" class="noEnterSubmit" action="serials-edit.pl" id="serials_edit">
100
100
101
[% IF ( Errors ) %]
101
[% IF ( Errors ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-2 / +2 lines)
Lines 332-339 Link Here
332
            <li><span class="label">End date:</span> [% enddate | html %]</li>
332
            <li><span class="label">End date:</span> [% enddate | html %]</li>
333
            <li><span class="label">History start date:</span> [% histstartdate | html %] </li>
333
            <li><span class="label">History start date:</span> [% histstartdate | html %] </li>
334
            <li><span class="label">History end date:</span> [% histenddate | html %]</li>
334
            <li><span class="label">History end date:</span> [% histenddate | html %]</li>
335
            <li><span class="label">Received issues:</span>[% recievedlist | html %]</li>
335
            <li><span class="label">Received issues:</span>[% recievedlist | html | html_line_break %]</li>
336
            <li><span class="label">Missing issues:</span>[% missinglist | html %]</li>
336
            <li><span class="label">Missing issues:</span>[% missinglist | html | html_line_break %]</li>
337
            <li><span class="label">Nonpublic note:</span>[% internalnotes | html | html_line_break %]</li>
337
            <li><span class="label">Nonpublic note:</span>[% internalnotes | html | html_line_break %]</li>
338
            <li><span class="label">Public note:</span>[% notes | html | html_line_break %]</li>
338
            <li><span class="label">Public note:</span>[% notes | html | html_line_break %]</li>
339
            <li><span class="label">History staff note:</span>[% librariannote | html | html_line_break %]</li>
339
            <li><span class="label">History staff note:</span>[% librariannote | html | html_line_break %]</li>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt (-1 / +1 lines)
Lines 832-838 Link Here
832
                                    [% END %]
832
                                    [% END %]
833
                                </span>[% END %]
833
                                </span>[% END %]
834
                                [% IF ( subscription.missinglist ) %]
834
                                [% IF ( subscription.missinglist ) %]
835
                                    <p class="subscription_missing">Missing issues: [% subscription.missinglist | html %] </p>
835
                                    <p class="subscription_missing">Missing issues: [% subscription.missinglist | html | html_line_break %] </p>
836
                                [% END %]
836
                                [% END %]
837
                                [% IF ( subscription.opacnote ) %]
837
                                [% IF ( subscription.opacnote ) %]
838
                                    <p class="subscription_opacnote">[% subscription.opacnote | html | html_line_break %]</p>
838
                                    <p class="subscription_opacnote">[% subscription.opacnote | html | html_line_break %]</p>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt (-2 / +2 lines)
Lines 120-131 Link Here
120
120
121
                                    [% IF ( subscription_LOO.recievedlist ) %]
121
                                    [% IF ( subscription_LOO.recievedlist ) %]
122
                                        <h5>Available issues</h5>
122
                                        <h5>Available issues</h5>
123
                                            <p>[% subscription_LOO.recievedlist | html %]</p>
123
                                            <p>[% subscription_LOO.recievedlist | html | html_line_break %]</p>
124
                                    [% END %]
124
                                    [% END %]
125
125
126
                                    [% IF ( subscription_LOO.missinglist ) %]
126
                                    [% IF ( subscription_LOO.missinglist ) %]
127
                                        <h5>Unavailable issues</h5>
127
                                        <h5>Unavailable issues</h5>
128
                                        <p>[% subscription_LOO.missinglist | html %]</p>
128
                                        <p>[% subscription_LOO.missinglist | html | html_line_break %]</p>
129
                                    [% END %]
129
                                    [% END %]
130
130
131
                                    [% IF ( subscription_LOO.opacnote ) %]
131
                                    [% IF ( subscription_LOO.opacnote ) %]
(-)a/opac/opac-serial-issues.pl (-7 lines)
Lines 71-79 if ( $selectview eq "full" ) { Link Here
71
    my $yearmin = $subscriptions->[0]->{year};
71
    my $yearmin = $subscriptions->[0]->{year};
72
    my $yearmax = $subscriptions->[ -1 ]->{year};
72
    my $yearmax = $subscriptions->[ -1 ]->{year};
73
73
74
    # replace CR by <br> in librarian note
75
    # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
76
77
    $template->param(
74
    $template->param(
78
        biblionumber   => scalar $query->param('biblionumber'),
75
        biblionumber   => scalar $query->param('biblionumber'),
79
        years          => $subscriptioninformation,
76
        years          => $subscriptioninformation,
Lines 106-114 else { Link Here
106
        }
103
        }
107
    }
104
    }
108
105
109
    # replace CR by <br> in librarian note
110
    # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
111
112
    my $title   = $subscriptions->[0]->{bibliotitle};
106
    my $title   = $subscriptions->[0]->{bibliotitle};
113
107
114
    $template->param(
108
    $template->param(
115
- 

Return to bug 23126