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

(-)a/C4/Serials.pm (-2 / +10 lines)
Lines 670-677 sub SearchSubscriptions { Link Here
670
        push @where_args, $args->{biblionumber};
670
        push @where_args, $args->{biblionumber};
671
    }
671
    }
672
    if( $args->{title} ){
672
    if( $args->{title} ){
673
        push @where_strs, "biblio.title LIKE ?";
673
        my @words = split / /, $args->{title};
674
        push @where_args, "%$args->{title}%";
674
        my (@strs, @args);
675
        foreach my $word (@words) {
676
            push @strs, "biblio.title LIKE ?";
677
            push @args, "%$word%";
678
        }
679
        if (@strs) {
680
            push @where_strs, '(' . join (' AND ', @strs) . ')';
681
            push @where_args, @args;
682
        }
675
    }
683
    }
676
    if( $args->{issn} ){
684
    if( $args->{issn} ){
677
        push @where_strs, "biblioitems.issn LIKE ?";
685
        push @where_strs, "biblioitems.issn LIKE ?";
(-)a/catalogue/detail.pl (+2 lines)
Lines 155-160 foreach my $subscription (@subscriptions) { Link Here
155
    $cell{branchcode}        = $subscription->{branchcode};
155
    $cell{branchcode}        = $subscription->{branchcode};
156
    $cell{branchname}        = GetBranchName($subscription->{branchcode});
156
    $cell{branchname}        = GetBranchName($subscription->{branchcode});
157
    $cell{hasalert}          = $subscription->{hasalert};
157
    $cell{hasalert}          = $subscription->{hasalert};
158
    $cell{callnumber}        = $subscription->{callnumber};
159
    $cell{closed}            = $subscription->{closed};
158
    #get the three latest serials.
160
    #get the three latest serials.
159
	$serials_to_display = $subscription->{staffdisplaycount};
161
	$serials_to_display = $subscription->{staffdisplaycount};
160
	$serials_to_display = C4::Context->preference('StaffSerialIssueDisplayCount') unless $serials_to_display;
162
	$serials_to_display = C4::Context->preference('StaffSerialIssueDisplayCount') unless $serials_to_display;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (+2 lines)
Lines 470-475 function verify_images() { Link Here
470
    [% FOREACH subscription IN subscriptions %]
470
    [% FOREACH subscription IN subscriptions %]
471
	    [% IF ( subscription.branchname ) %]<h3>At library: [% subscription.branchname %]</h3>[% ELSE %]
471
	    [% IF ( subscription.branchname ) %]<h3>At library: [% subscription.branchname %]</h3>[% ELSE %]
472
	    [% IF ( subscription.branchcode ) %]<h3>At library: [% subscription.branchcode %]</h3>[% END %][% END %]
472
	    [% IF ( subscription.branchcode ) %]<h3>At library: [% subscription.branchcode %]</h3>[% END %][% END %]
473
            [% IF ( subscription.closed ) %]<p>This subscription is closed.</p>[% END %]
474
            [% IF ( subscription.callnumber ) %]<p>Callnumber: [% subscription.callnumber %] </p>[% END %]
473
            [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes FILTER html_line_break %] </p>[% END %]
475
            [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes FILTER html_line_break %] </p>[% END %]
474
            [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist %] </p>[% END %]
476
            [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist %] </p>[% END %]
475
            [% IF ( subscription.librariannote ) %]<p>([% subscription.librariannote %])</p>[% END %]
477
            [% IF ( subscription.librariannote ) %]<p>([% subscription.librariannote %])</p>[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt (+8 lines)
Lines 38-43 Link Here
38
                <th>Call number</th>
38
                <th>Call number</th>
39
                <th>Subscription begin</th>
39
                <th>Subscription begin</th>
40
                <th>Subscription end</th>
40
                <th>Subscription end</th>
41
                <th>Expired? / Closed?</th>
41
			</tr>
42
			</tr>
42
		</thead>
43
		</thead>
43
		<tbody>
44
		<tbody>
Lines 50-55 Link Here
50
					<td>[% data.callnumber %]</td>
51
					<td>[% data.callnumber %]</td>
51
					<td>[% data.startdate %]</td>
52
					<td>[% data.startdate %]</td>
52
					<td>[% data.enddate %]</td>
53
					<td>[% data.enddate %]</td>
54
                    <td>
55
                        [% IF data.closed %]
56
                            Closed
57
                        [% ELSIF data.expired %]
58
                            Expired
59
                        [% END %]
60
                    </td>
53
				</tr>
61
				</tr>
54
				[% END %]
62
				[% END %]
55
			</tr>
63
			</tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt (-1 / +1 lines)
Lines 230-236 $(document).ready(function() { Link Here
230
        </td>
230
        </td>
231
        <td>
231
        <td>
232
            [% IF ( serialslis.editdisable ) %]
232
            [% IF ( serialslis.editdisable ) %]
233
              <input type="hidden" name="status" id="status[% serialslis.serialid %]" value="1">
233
              <input type="hidden" name="status" id="status[% serialslis.serialid %]" value="[% serialslis.serstatus %]">
234
              <select name="status" size="1"  disabled="disabled">
234
              <select name="status" size="1"  disabled="disabled">
235
            [% ELSE %]
235
            [% ELSE %]
236
              [% IF ( serialslis.serialsadditems ) %]
236
              [% IF ( serialslis.serialsadditems ) %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt (+2 lines)
Lines 981-986 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
981
    [% FOREACH subscription IN subscriptions %]
981
    [% FOREACH subscription IN subscriptions %]
982
    [% IF ( subscription.branchname ) %]<h3>At library: [% subscription.branchname %]</h3>[% ELSE %]
982
    [% IF ( subscription.branchname ) %]<h3>At library: [% subscription.branchname %]</h3>[% ELSE %]
983
    [% IF ( subscription.branchcode ) %]<h3>At library: [% subscription.branchcode %]</h3>[% END %][% END %]
983
    [% IF ( subscription.branchcode ) %]<h3>At library: [% subscription.branchcode %]</h3>[% END %][% END %]
984
    [% IF ( subscription.closed ) %]<p>This subscription is closed.</p>[% END %]
985
    <span style="display:none;"> [% IF ( subscription.callnumber ) %]<p>Callnumber: [% subscription.callnumber %]</p>[% END %]</span>
984
    [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes FILTER html_line_break %] </p>[% END %]
986
    [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes FILTER html_line_break %] </p>[% END %]
985
    <p>Subscription from: [% subscription.histstartdate | $KohaDates %] to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate | $KohaDates %] [% ELSE %] now (current)[% END %]</p>
987
    <p>Subscription from: [% subscription.histstartdate | $KohaDates %] to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate | $KohaDates %] [% ELSE %] now (current)[% END %]</p>
986
    [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist %] </p>[% END %]
988
    [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist %] </p>[% END %]
(-)a/opac/opac-detail.pl (+2 lines)
Lines 470-475 foreach my $subscription (@subscriptions) { Link Here
470
    $cell{branchcode}        = $subscription->{branchcode};
470
    $cell{branchcode}        = $subscription->{branchcode};
471
    $cell{branchname}        = GetBranchName($subscription->{branchcode});
471
    $cell{branchname}        = GetBranchName($subscription->{branchcode});
472
    $cell{hasalert}          = $subscription->{hasalert};
472
    $cell{hasalert}          = $subscription->{hasalert};
473
    $cell{callnumber}        = $subscription->{callnumber};
474
    $cell{closed}            = $subscription->{closed};
473
    #get the three latest serials.
475
    #get the three latest serials.
474
    $serials_to_display = $subscription->{opacdisplaycount};
476
    $serials_to_display = $subscription->{opacdisplaycount};
475
    $serials_to_display = C4::Context->preference('OPACSerialIssueDisplayCount') unless $serials_to_display;
477
    $serials_to_display = C4::Context->preference('OPACSerialIssueDisplayCount') unless $serials_to_display;
(-)a/reports/serials_stats.pl (-1 / +2 lines)
Lines 96-107 if($do_it){ Link Here
96
    while(my $row = $sth->fetchrow_hashref){
96
    while(my $row = $sth->fetchrow_hashref){
97
        $row->{'enddate'} = format_date(GetExpirationDate($row->{'subscriptionid'}));
97
        $row->{'enddate'} = format_date(GetExpirationDate($row->{'subscriptionid'}));
98
        $row->{'startdate'} = format_date($row->{'startdate'});
98
        $row->{'startdate'} = format_date($row->{'startdate'});
99
        $row->{expired} = HasSubscriptionExpired($row->{subscriptionid});
99
        push @datas, $row if (
100
        push @datas, $row if (
100
            $expired
101
            $expired
101
            or (
102
            or (
102
                not $expired
103
                not $expired
103
                and (
104
                and (
104
                    not HasSubscriptionExpired($row->{subscriptionid})
105
                    not $row->{expired}
105
                    and not $row->{closed}
106
                    and not $row->{closed}
106
                )
107
                )
107
            )
108
            )
(-)a/serials/serials-edit.pl (-1 / +1 lines)
Lines 151-156 foreach my $serialid (@serialids) { Link Here
151
            )
151
            )
152
            || $serinfo->{'cannotedit'}
152
            || $serinfo->{'cannotedit'}
153
        );
153
        );
154
        $serinfo->{editdisable} ||= ($serinfo->{status8} and $serinfo->{closed});
154
        push @serialdatalist, $serinfo;
155
        push @serialdatalist, $serinfo;
155
        $processedserialid{$serialid} = 1;
156
        $processedserialid{$serialid} = 1;
156
    }
157
    }
157
- 

Return to bug 8782