From 3e8d2e194ac80ed6d26b676ec55e020939df5e6a Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Tue, 9 Aug 2022 15:50:36 +0000 Subject: [PATCH] Bug 21159: Template and yaml changes Sponsored-by: Toi Ohomai Institute of Technology, New Zealand --- .../prog/en/includes/patron_messages.inc | 35 ++++++++++++++++++- .../admin/preferences/circulation.pref | 17 +++++++++ .../prog/js/pages/preferences.js | 2 +- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc index cb99f267e7c..88ad2818e3e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc @@ -4,7 +4,7 @@ [% SET return_claims = patron.return_claims %] [% SET logged_in_branchcode = Branches.GetLoggedInBranchcode() %] -[% IF ( has_modifications || warndeparture || returnbeforeexpiry || expired || patron.gonenoaddress || patron.lost || userdebarred || odues || ( return_claims.count > ClaimReturnedWarningThreshold ) || age_limitations || charges || charges_guarantors_guarantees || charges_guarantees || credits ) %] +[% IF ( has_modifications || warndeparture || returnbeforeexpiry || expired || patron.gonenoaddress || patron.lost || userdebarred || odues || ( return_claims.count > ClaimReturnedWarningThreshold ) || age_limitations || charges || charges_guarantors_guarantees || charges_guarantees || credits || ItemLocationUpdated ) %]

Attention

[% END # /F ( has_modifications || warndeparture... %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index 488ee65ba15..c971cbdf175 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -640,6 +640,23 @@ Circulation: - "Note: PROC and CART are special values, for these locations the location and permanent_location can differ, in all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout.
" - "The special term _BLANK_ may be used on either side of a value pair to update or remove the location from items with no location assigned.
" - "The special term _ALL_ is used on the left side of the colon (:) to affect all items, and overrides all other rules." + - + - pref: UpdateItemLocationOnCheckout + type: textarea + syntax: text/x-yaml + class: code + - "This is a list of value pairs. The first value is followed immediately by colon space then the second value.

" + - "Examples:
" + - "PROC: FIC - causes an item in the Processing Center location to be updated into the Fiction location on check out.
" + - "FIC: GEN - causes an item in the Fiction location to be updated into the General stacks location on check out.
" + - "_BLANK_: FIC - causes an item that has no location to be updated into the Fiction location on check out.
" + - "FIC: _BLANK_ - causes an item in location FIC to be updated to a blank location on check out.
" + - "_ALL_: FIC - causes all items to be updated into the Fiction location on check out.
" + - "PROC: _PERM_ - causes an item that is in the Processing Center to be updated to it's permanent location.

" + - "General rule: if the location value on the left of the colon (:) matches the item's current location, it will be updated to match the location value on the right of the colon (:).
" + - "Note: PROC and CART are special values, for these locations the location and permanent_location can differ, in all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout.
" + - "The special term _BLANK_ may be used on either side of a value pair to update or remove the location from items with no location assigned.
" + - "The special term _ALL_ is used on the left side of the colon (:) to affect all items, and overrides all other rules." - - pref: UpdateNotForLoanStatusOnCheckin type: textarea diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js b/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js index fb63d4b3978..00db8edef3e 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js +++ b/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js @@ -184,7 +184,7 @@ $( document ).ready( function () { document.location.hash = "jumped"; } - $("#pref_UpdateItemLocationOnCheckin").change(function(){ + $("#pref_UpdateItemLocationOnCheckin, #pref_UpdateItemLocationOnCheckout").change(function(){ var the_text = $(this).val(); var alert_text = ''; if (the_text.indexOf('_ALL_:') != -1) alert_text = __("Note: _ALL_ value will override all other values") + '\n'; -- 2.20.1