From f2d22218dfeab6164e062d53a019922688741ad6 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 --- .../en/modules/course_reserves/course-details.tt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 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 e2d3fb96557..6a618630527 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 @@ -151,10 +151,14 @@ [% IF cr.course_item.itype_enabled %] [% IF cr.course_item.enabled == 'yes' %] [% ItemTypes.GetDescription( cr.item.effective_itemtype ) | html %] - ([% ItemTypes.GetDescription( cr.course_item.itype_storage ) | html %]) + [% IF (cr.course_item.itype_storage ) %] + ([% ItemTypes.GetDescription( cr.course_item.itype_storage ) | html %]) + [% END %] [% ELSE %] [% ItemTypes.GetDescription( cr.course_item.itype ) | html %] - ([% ItemTypes.GetDescription( cr.item.effective_itemtype) | html %]) + [% IF ( cr.item.effective_itemtype ) %] + ([% ItemTypes.GetDescription( cr.item.effective_itemtype) | html %]) + [% END %] [% END %] [% ELSE %] Unchanged @@ -168,7 +172,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 %] @@ -188,7 +192,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 %] @@ -208,7 +212,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 %] @@ -228,7 +232,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 %] -- 2.39.5