From 98798a6be8ddcca981c8cc21a2ce381c9a0af49e Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Sat, 29 Sep 2018 18:09:03 +0000 Subject: [PATCH] Bug 21446: Improve display of changed values on course reserves and show permanent location instead of cart TO TEST: 1) Set ReturnToShelvingCart on. 2) Create a Course Reserve and make inactive. 3) Add an item, changing Item type, Collection code, Shelving location, and Holding library. 4) Note these four fields in the item list. 5) Activate course reserve. 6) Note subtle/no difference in these fiels in the list. 7) Check in the item. 8) Go back to course reserves and note that the cart is listed in the field instead of permanent location. 9) Deactivate course reserve. 10) Reset permanent location on item manually. 11) Apply patch. 12) Repeat steps 4-9 noting that the permanent location is showing instead of current location. Also, if a change is assigned to the item, the change AND the regular state always show. The active state will be in bold. Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens --- .../modules/course_reserves/course-details.tt | 41 +++++++++++++++---- 1 file changed, 33 insertions(+), 8 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 931a355d5c..6cb270d0a0 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 @@ -104,9 +104,15 @@ [% IF cr.course_item.itype.defined %] [% IF cr.course_item.enabled == 'yes' %] - [% ItemTypes.GetDescription( cr.item.itype ) | html %] + [% ItemTypes.GetDescription( cr.item.itype) | html %] + [% IF cr.item.itype %] + ([% ItemTypes.GetDescription( cr.course_item.itype ) | html %]) + [% END %] [% ELSE %] [% ItemTypes.GetDescription( cr.course_item.itype ) | html %] + [% IF cr.item.itype %] + ([% ItemTypes.GetDescription( cr.item.itype) | html %] + [% END %] [% END %] [% ELSE %] Unchanged @@ -119,9 +125,15 @@ [% IF cr.course_item.ccode.defined %] [% IF cr.course_item.enabled == 'yes' %] - [% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) | html %] + [% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) | html %] + [% IF cr.item.ccode %] + ([% AuthorisedValues.GetByCode( 'CCODE', cr.course_item.ccode ) | html %]) + [% END %] [% ELSE %] - [% AuthorisedValues.GetByCode( 'CCODE', cr.course_item.ccode ) | html %] + [% AuthorisedValues.GetByCode( 'CCODE', cr.course_item.ccode ) | html %] + [% IF cr.item.ccode %] + ([% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) | html %]) + [% END %] [% END %] [% ELSE %] Unchanged @@ -132,24 +144,36 @@ [% IF cr.course_item.location.defined %] - [% IF cr.course_item.enabled == 'yes' %] - [% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) | html %] + [% IF cr.course_item.enabled == 'yes' %] + [% AuthorisedValues.GetByCode( 'LOC', cr.item.permanent_location ) | html %] + [% IF cr.item.permanent_location %] + ([% AuthorisedValues.GetByCode( 'LOC', cr.course_item.location ) | html %]) + [% END %] [% ELSE %] [% AuthorisedValues.GetByCode( 'LOC', cr.course_item.location ) | html %] + [% IF cr.item.permanent_location %] + ([% AuthorisedValues.GetByCode( 'LOC', cr.item.permanent_location ) | html %]) + [% END %] [% END %] [% ELSE %] Unchanged - [% IF cr.item.location %] - ([% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) | html %]) + [% IF cr.item.permanent_location %] + ([% AuthorisedValues.GetByCode( 'LOC', cr.item.permanent_location ) | html %]) [% END %] [% END %] [% IF cr.course_item.holdingbranch.defined %] [% IF cr.course_item.enabled == 'yes' %] - [% Branches.GetName( cr.item.holdingbranch ) | html %] + [% Branches.GetName( cr.item.holdingbranch ) | html %] + [% IF cr.item.holdingbranch %] + ([% Branches.GetName( cr.course_item.holdingbranch ) | html %]) + [% END %] [% ELSE %] [% Branches.GetName( cr.course_item.holdingbranch ) | html %] + [% IF cr.item.holdingbranch %] + ([% Branches.GetName( cr.item.holdingbranch ) | html %]) + [% END %] [% END %] [% ELSE %] Unchanged @@ -158,6 +182,7 @@ [% END %] [% END %] + [% IF (cr.staff_note) %] [% cr.staff_note | html %] [% ELSIF (cr.item.itemnotes_nonpublic) %] -- 2.39.5