Attachment 139104 Details for Bug 21159 – Bug 21159: Template and yaml changes

[patch] Bug 21159: Template and yaml changes

Bug-21159-Template-and-yaml-changes.patch (text/plain), 6.88 KB, created by Alex Buckley on 2022-08-15 02:00:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Buckley

Created: 2022-08-15 02:00:44 UTC

Size: 6.88 KB

patch

obsolete

>From 3e8d2e194ac80ed6d26b676ec55e020939df5e6a Mon Sep 17 00:00:00 2001
>From: Alex Buckley <alexbuckley@catalyst.net.nz>
>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 ) %]
> <h3>Attention</h3>
> <ul>
> [% IF ( has_modifications ) %]
>@@ -128,6 +128,39 @@
> </li>
> [% END %]
> 
>+ [% IF ( ItemLocationUpdated ) %]
>+ 
>+ [% FOREACH Location IN ItemLocationUpdated.values %]
>+		Item shelving location updated.
>+ Old value:
>+ [% IF Location.from %]
>+ [% SET av_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => Location.from ) %]
>+ [% IF Location.from == '' %]
>+ empty
>+ [% ELSIF av_description == '' %]
>+ [% Location.from | html %] (No description available)
>+ [% ELSE %]
>+ [% av_description | html %]
>+ [% END %]
>+ [% ELSE %]
>+ "Blank"
>+ [% END %]
>+ New value:
>+ [% IF Location.to %]
>+ [% SET av_description = AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => Location.to ) %]
>+ [% IF Location.to == '' %]
>+ empty
>+ [% ELSIF av_description == '' %]
>+ [% Location.to | html %] (Not an authorized value)
>+ [% ELSE %]
>+ [% av_description | html %]
>+ [% END %]
>+ [% ELSE %]
>+ "Blank"
>+ [% END %]
>+ [% END %]
>+	 
>+ [% END %]
> </ul>
> 
> [% 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

Actions: View | Diff | Splinter Review

Attachments on bug 21159: 77487 | 77549 | 77594 | 77775 | 77859 | 77869 | 77870 | 77871 | 80892 | 80893 | 80894 | 80895 | 87037 | 87038 | 87041 | 87693 | 87694 | 87695 | 139097 | 139098 | 139099 | 139103 | 139104 | 139105 | 139106 | 139107 | 139108 | 139109 | 139220 | 146602 | 146603 | 146604 | 146605 | 146606 | 146607 | 146608 | 154147 | 154148 | 154149 | 154150 | 154151 | 154152 | 155284 | 155285 | 155771 | 155772 | 155773 | 155774 | 158146 | 158147 | 158149 | 158150 | 158169 | 158170 | 158171 | 158172 | 158173 | 158521 | 158522