Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 17127: Remove notes from detail.tt to only use MARCNOTES

Browse source 
Notes come from the biblio table, but that table is already used to fill in MARCNOTES through Biblio.pm and get_marc_notes.
Get_marc_notes does check for NotesToHide and already read every note on the records, but .notes doesn't go through that same filter.
I don't see the point of keeping notes as a condition when MARCNOTES does the same job but better.

To test:
    1) Take any record, or create one
    2) Input something in the 500 field (or 300 in UNIMARC)
    3) In Systempreferences -> NotesToHide, fill in the number 500 (or 300).
    4) Save, then go look at the record detail in the OPAC and admin website.
    5) You should still see the 500 or 300 field under the Description tab.
    6) Apply patch.
    7) Reload the record detail page.
    8) Observe the error is gone.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Florian Bontemps 2021-10-27 12:50:42 +00:00 committed by Fridolin Somers
parent c780d61f90
commit f004ad000d
2 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
View file

@ -268,7 +268,7 @@
<a href="#holdings">Holdings ([% itemloop.size() || 0 | html %])</a>
</li>
[% END %]
[% IF ( MARCNOTES || notes ) %]<li><a href="#description">Descriptions ([% ( MARCNOTES.size || 1 ) | html %])</a></li>[% END %]
[% IF ( MARCNOTES ) %]<li><a href="#description">Descriptions ([% ( MARCNOTES.size || 1 ) | html %])</a></li>[% END %]
[% IF ComponentParts && ComponentParts.size %]<li id="components_tab"><a href="#components">Components ([% ComponentParts.size | html %])</a></li>[% END %]
[% IF ( subscriptionsnumber ) %]<li><a href="#subscriptions">Subscriptions</a></li>[% END %]
[% IF Koha.Preference('AcquisitionDetails') %]<li><a href="#acq_details">Acquisition details</a></li>[% END %]
@ -650,12 +650,11 @@ Note that permanent location is a code, and location may be an authval.
</div>
[% END %]
[% IF ( MARCNOTES || notes ) %]
[% IF ( MARCNOTES ) %]
<div id="description">
<div class="content_set">
[% IF ( MARCNOTES ) %]
[% FOREACH MARCNOTE IN MARCNOTES %]
<p>
[% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
@ -664,11 +663,6 @@ Note that permanent location is a code, and location may be an authval.
[% MARCNOTE.marcnote | html | html_line_break %]
[% END %]
</p>
[% END %]
[% ELSE %]
[% IF ( notes ) %]
<p>[% notes | html %]</p>
[% END %]
[% END %]
</div>
</div>

12
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
View file

@ -392,12 +392,10 @@
[% IF (SeparateHoldings) %]
<li><a href="#otherholdings">Other holdings [% ' ( ' _ (otheritemloop.size || 0) _ ' )' | html %]</a></li>
[% END %]
[% IF ( MARCNOTES || notes || ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY )) %]
[% IF ( MARCNOTES || ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY )) %]
[% SET title_notes_count = 0 %]
[% IF MARCNOTES %]
[% SET title_notes_count = MARCNOTES.size %]
[% ELSIF notes %]
[% SET title_notes_count = 1 %]
[% END %]
[% IF SYNDETICS_SUMMARY %][% SET title_notes_count = title_notes_count + 1 %][% END %]
<li id="tab_descriptions"> <a href="#descriptions">Title notes ( [% title_notes_count | html %] )</a></li>
@ -562,7 +560,7 @@
</div>
[% END # / SeparateHoldings %]
[% IF ( MARCNOTES || notes || ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY )) %]
[% IF ( MARCNOTES || ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY )) %]
<div id="descriptions">
<div class="content_set">
@ -583,15 +581,11 @@
</p>
[% END %]
</div>
[% ELSE %]
[% IF ( notes ) %]
<p>[% notes | html %]</p>
[% END %]
[% END %]
</div> <!-- /.content_set -->
</div> <!-- / #descriptions -->
[% END # / IF MARCNOTES || notes %]
[% END # / IF MARCNOTES %]
[% IF ComponentParts && ComponentParts.size %]
<div id="components">