Attachment #153074 for bug #33956

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

Lines 344-350 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-3 / +3 lines)
344	[% IF ( OPACFinesTab ) %]	344	[% IF ( OPACFinesTab ) %]
345	<th>Fines</th>	345	<th>Fines</th>
346	[% END %]	346	[% END %]
347	[% IF ( OPACMySummaryHTML ) %]	347	[% IF Koha.Preference('OPACMySummaryHTML') %]
348	<th class="nosort">Links</th>	348	<th class="nosort">Links</th>
349	[% END %]	349	[% END %]
350	[% IF ( Koha.Preference('AllowCheckoutNotes') ) %]	350	[% IF ( Koha.Preference('AllowCheckoutNotes') ) %]
Lines 525-532 Link Here
525	[% END %]	525	[% END %]
526	</td>	526	</td>
527	[% END %]	527	[% END %]
528	[% IF ( OPACMySummaryHTML ) %]	528	[% IF Koha.Preference('OPACMySummaryHTML') %]
529	<td class="links">[% ISSUE.MySummaryHTML \| $raw %]</td>	529	<td class="links">[% ISSUE.biblio_object.opac_summary_html\| $raw %]</td>
530	[% END %]	530	[% END %]
531	[% IF ( Koha.Preference('AllowCheckoutNotes') ) %]	531	[% IF ( Koha.Preference('AllowCheckoutNotes') ) %]
532	<td>	532	<td>




                    amountoutstanding => $amountoutstanding,
                    borrowernumber    => $borrowernumber,
                    patron_flagged    => $borr->{flagged},
                    OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0,
                    surname           => $borr->{surname},
                    RENEW_ERROR       => $renew_error,
                    borrower          => $borr,

            $issue->{normalized_upc}  = GetNormalizedUPC( $marcrecord, C4::Context->preference('marcflavour') );
            $issue->{normalized_oclc} = GetNormalizedOCLCNumber( $marcrecord, C4::Context->preference('marcflavour') );
        }
                # My Summary HTML
                if (my $my_summary_html = C4::Context->preference('OPACMySummaryHTML')){
                    $issue->{author} ? $my_summary_html =~ s/{AUTHOR}/$issue->{author}/g : $my_summary_html =~ s/{AUTHOR}//g;
                    $issue->{title} =~ s/\/+$//; # remove trailing slash
                    $issue->{title} =~ s/\s+$//; # remove trailing space
                    $issue->{title} ? $my_summary_html =~ s/{TITLE}/$issue->{title}/g : $my_summary_html =~ s/{TITLE}//g;
                    $issue->{isbn} ? $my_summary_html =~ s/{ISBN}/$isbn/g : $my_summary_html =~ s/{ISBN}//g;
                    $issue->{biblionumber} ? $my_summary_html =~ s/{BIBLIONUMBER}/$issue->{biblionumber}/g : $my_summary_html =~ s/{BIBLIONUMBER}//g;
                    $issue->{MySummaryHTML} = $my_summary_html;
                }

        if ( C4::Context->preference('UseRecalls') ) {
            my $maybe_recalls = Koha::Recalls->search({ biblio_id => $issue->{biblionumber}, item_id => [ undef, $issue->{itemnumber} ], completed => 0 });
- 

Return to bug 33956

Lines 178-184 $template->param( Link Here

(-)a/opac/opac-user.pl (-12 lines)
178	amountoutstanding => $amountoutstanding,	178	amountoutstanding => $amountoutstanding,
179	borrowernumber => $borrowernumber,	179	borrowernumber => $borrowernumber,
180	patron_flagged => $borr->{flagged},	180	patron_flagged => $borr->{flagged},
181	OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0,
182	surname => $borr->{surname},	181	surname => $borr->{surname},
183	RENEW_ERROR => $renew_error,	182	RENEW_ERROR => $renew_error,
184	borrower => $borr,	183	borrower => $borr,
Lines 306-321 if ( $pending_checkouts->count ) { # Useless test Link Here
306	$issue->{normalized_upc} = GetNormalizedUPC( $marcrecord, C4::Context->preference('marcflavour') );	305	$issue->{normalized_upc} = GetNormalizedUPC( $marcrecord, C4::Context->preference('marcflavour') );
307	$issue->{normalized_oclc} = GetNormalizedOCLCNumber( $marcrecord, C4::Context->preference('marcflavour') );	306	$issue->{normalized_oclc} = GetNormalizedOCLCNumber( $marcrecord, C4::Context->preference('marcflavour') );
308	}	307	}
309	# My Summary HTML
310	if (my $my_summary_html = C4::Context->preference('OPACMySummaryHTML')){
311	$issue->{author} ? $my_summary_html =~ s/{AUTHOR}/$issue->{author}/g : $my_summary_html =~ s/{AUTHOR}//g;
312	$issue->{title} =~ s/\/+$//; # remove trailing slash
313	$issue->{title} =~ s/\s+$//; # remove trailing space
314	$issue->{title} ? $my_summary_html =~ s/{TITLE}/$issue->{title}/g : $my_summary_html =~ s/{TITLE}//g;
315	$issue->{isbn} ? $my_summary_html =~ s/{ISBN}/$isbn/g : $my_summary_html =~ s/{ISBN}//g;
316	$issue->{biblionumber} ? $my_summary_html =~ s/{BIBLIONUMBER}/$issue->{biblionumber}/g : $my_summary_html =~ s/{BIBLIONUMBER}//g;
317	$issue->{MySummaryHTML} = $my_summary_html;
318	}
319		308
320	if ( C4::Context->preference('UseRecalls') ) {	309	if ( C4::Context->preference('UseRecalls') ) {
321	my $maybe_recalls = Koha::Recalls->search({ biblio_id => $issue->{biblionumber}, item_id => [ undef, $issue->{itemnumber} ], completed => 0 });	310	my $maybe_recalls = Koha::Recalls->search({ biblio_id => $issue->{biblionumber}, item_id => [ undef, $issue->{itemnumber} ], completed => 0 });
322	-