From e46b444ac055145917c650afead2fdc3336083ea Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 10 Feb 2025 16:35:24 +0000 Subject: [PATCH] Bug 39078: Fix incorrect variable checks in course reserve details template This patch adds some variable checks and corrects some others so that the course reserve detail template doesn't show empty parentheses. To test, apply the patch and create a course if necessary. - Add an item to the course. - After submitting a barcode, check the checkbox next to each option and select a different value (item type, collection, etc.). - View the course details and check the columns for the fields you changed. They should display the correct information: "Updated field value (Original field value)" - Add another item but this time don't change any options. The information should be display as: "Unchanged (Original field value)" - There should be no instances where it looks like: "Field value ()" Sponsored-by: Athens County Public Libraries Signed-off-by: David Nind Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer (cherry picked from commit 753659589a7fae7e522c4bf4bfae025b02b3bcf0) Signed-off-by: Baptiste Wojtkowski --- .../en/modules/course_reserves/course-details.tt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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 c800701582..5a48b8281f 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 @@ -152,11 +152,15 @@ [% IF cr.course_item.itype_enabled %] [% IF cr.course_item.enabled == 'yes' %] [% ItemTypes.GetDescription( cr.item.effective_itemtype ) | html %] + [% IF (cr.course_item.itype_storage ) %] ([% ItemTypes.GetDescription( cr.course_item.itype_storage ) | html %]) + [% END %] [% ELSE %] [% ItemTypes.GetDescription( cr.course_item.itype ) | html %] + [% IF ( cr.item.effective_itemtype ) %] ([% ItemTypes.GetDescription( cr.item.effective_itemtype) | html %]) [% END %] + [% END %] [% ELSE %] Unchanged [% IF cr.item.itype %] @@ -169,7 +173,7 @@ [% IF cr.course_item.ccode_enabled %] [% IF cr.course_item.enabled == 'yes' %] [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => cr.item.ccode ) | html %] - [% IF cr.item.ccode %] + [% IF cr.course_item.ccode_storage %] ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => cr.course_item.ccode_storage ) | html %]) [% END %] [% ELSE %] @@ -189,7 +193,7 @@ [% IF cr.course_item.location_enabled %] [% IF cr.course_item.enabled == 'yes' %] [% AuthorisedValues.GetByCode( 'LOC', cr.item.permanent_location ) | html %] - [% IF cr.item.permanent_location %] + [% IF cr.course_item.location_storage %] ([% AuthorisedValues.GetByCode( 'LOC', cr.course_item.location_storage ) | html %]) [% END %] [% ELSE %] @@ -209,7 +213,7 @@ [% IF cr.course_item.homebranch_enabled %] [% IF cr.course_item.enabled == 'yes' %] [% Branches.GetName( cr.item.homebranch ) | html %] - [% IF cr.item.homebranch %] + [% IF cr.course_item.homebranch_storage %] ([% Branches.GetName( cr.course_item.homebranch_storage ) | html %]) [% END %] [% ELSE %] @@ -229,7 +233,7 @@ [% IF cr.course_item.holdingbranch_enabled %] [% IF cr.course_item.enabled == 'yes' %] [% Branches.GetName( cr.item.holdingbranch ) | html %] - [% IF cr.item.holdingbranch %] + [% IF cr.course_item.holdingbranch_storage %] ([% Branches.GetName( cr.course_item.holdingbranch_storage ) | html %]) [% END %] [% ELSE %]