From ee71ace105a263ecf8ecedd846c83414a8455bab Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Wed, 21 Jun 2023 19:21:05 +0000 Subject: [PATCH] Bug 34086: Show location on detail page when there is no permenant location To test: 1. Have some items without a permanent location. 2. Go to the staff detail page. 3. In the 'Home library' column notice the span .shelvingloc is empty. 4. Add a permanent location, now the shelvingloc is populated 5. Apply patch 6. The location should now show even when there is no permenant location. Signed-off-by: Sam Lau Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit b5c6435fe8df35ef45b6cfd4cc7c4f7e7c92b52a) Signed-off-by: Martin Renvoize --- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 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 081dc7426a..bfc258eda4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -421,10 +421,10 @@ [%# If permanent location is defined, show description or code and %] [%# display current location in parentheses. If not, display current location. %] [%# Note that permanent location is a code, and location may be an authval. %] - [% IF item.permanent_location %] + [% SET item_location = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) %] + [% IF item.permanent_location %] [% SET permloc_authval = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.permanent_location ) %] [% permloc_authval | html %] - [% SET item_location = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) %] [% IF item_location AND item_location != permloc_authval AND item.location != item.permanent_location %] ([% item_location | html %]) [% END %] -- 2.20.1