From cea0189b1555859a7ae55cdc6763e6e0dc43574a Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 25 Jun 2019 11:44:12 +0000 Subject: [PATCH] Bug 23194: Fix other occurences Throughout staff client and course reserves we also show the field with HTML filter, maybe we shouldn't? The items lost report also included the note as a title element on title and barcode links, I removed this as the note displays in that table To test: 1 - Add a link to publicnotes for an item Cats! 2 - View opac details, confirm the note is a link 3 - Same for staff side 4 - Add item to a course reserve UseCourseReserves preference must be set to 'Use' From the course reserves module you will need to add a course (and possibly a department first) Adding should be intuitive 5 - Confirm note is a link in course details on staff and opac 6 - Perform a batch checkout, confirm the itemnote shows as a link You will need to enable the system preference: BatchCheckouts and add a patron category to: BatchCheckoutsValidCategories Then a link should be available from checkout for a patron in that category 7 - Mark the item as lost 8 - Go to Reports->Items lost 9 - Confirm the note is a URL and that title and barcode links don't show the note 10 - Click the barcode to go to moredetails for the item - in this case note should display as editable text, not a link Signed-off-by: Claire Gravely Signed-off-by: frederik chenier Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize (cherry picked from commit f447658f850bca5ebcdb6f29a5572c1c1707f942) Signed-off-by: Fridolin Somers --- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 2 +- .../prog/en/modules/circ/circulation_batch_checkouts.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt | 2 +- .../prog/en/modules/course_reserves/course-details.tt | 2 +- .../intranet-tmpl/prog/en/modules/reports/itemslost.tt | 6 +++--- .../opac-tmpl/bootstrap/en/modules/opac-course-details.tt | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 6af2687453..a963b84804 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -360,7 +360,7 @@ [% item.materials | html %] [% END %] [% IF ( itemdata_itemnotes ) %] -
[% item.itemnotes | html %]
+
[% item.itemnotes | $raw %]
[% END %] [% IF itemdata_nonpublicnotes %] [% item.itemnotes_nonpublic | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt index 281eec1546..7539633d13 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt @@ -117,7 +117,7 @@ [% END %] [% checkout_info.barcode | html %] - [% checkout_info.biblio.title | html %][% FOREACH subtitle IN checkout_info.biblio.subtitles %] [% subtitle.subfield | html %][% END %][% IF checkout_info.biblio.author %], by [% checkout_info.biblio.author | html %][% END %][% IF ( checkout_info.item.itemnotes ) %]- [% checkout_info.item.itemnotes | html %][% END %] [% checkout_info.item.barcode | html %] + [% checkout_info.biblio.title | html %][% FOREACH subtitle IN checkout_info.biblio.subtitles %] [% subtitle.subfield | html %][% END %][% IF checkout_info.biblio.author %], by [% checkout_info.biblio.author | html %][% END %][% IF ( checkout_info.item.itemnotes ) %]- [% checkout_info.item.itemnotes | $raw %][% END %] [% checkout_info.item.barcode | html %] [% IF checkout_info.NEEDSCONFIRMATION %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt index 6b1d94fd4e..18ff03d0f4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt @@ -48,7 +48,7 @@ [% item.firstname | html %] [% item.surname | html %] - [% item.title | html %][% IF ( item.author ) %], by [% item.author | html %][% END %][% IF ( item.itemnotes ) %]- [% item.itemnotes | html %][% END %] + [% item.title | html %][% IF ( item.author ) %], by [% item.author | html %][% END %][% IF ( item.itemnotes ) %]- [% item.itemnotes | $raw %][% END %] [% item.itemcallnumber | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt index 446192d0e5..35a6f3703d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt @@ -190,7 +190,7 @@ [% IF (cr.public_note) %] [% cr.public_note | html %] [% ELSIF (cr.item.itemnotes) %] - [% cr.item.itemnotes | html %] + [% cr.item.itemnotes | $raw %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt index c12b677f34..0b2dc2e1fb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt @@ -99,13 +99,13 @@ [% END %] - [% item.biblio.title | html %] + [% item.biblio.title | html %] [% item.biblio.author | html %] [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => item.itemlost ) | html %] [% item.itemlost_on | $KohaDates %] - [% item.barcode | html %] + [% item.barcode | html %] [% item.itemcallnumber | html %] [% item.datelastseen | $KohaDates %] @@ -117,7 +117,7 @@ [% Branches.GetName(item.holdingbranch) | html %] [% AuthorisedValues.GetByCode( 'LOC', item.location ) | html %] [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.notforloan', authorised_value => item.notforloan ) | html %] - [% item.itemnotes | html %] + [% item.itemnotes | $raw %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt index 17677bd98c..b47c376768 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt @@ -80,7 +80,7 @@ [% IF ( cr.public_note ) %] [% cr.public_note | html %] [% ELSIF ( cr.item.itemnotes ) %] - [% cr.item.itemnotes | html %] + [% cr.item.itemnotes | $raw %] [% END %] [% IF (cr.item.uri) %] -- 2.39.5