From b41d84a17802c94ddce2489816c0fb861d1ee28d Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 27 Nov 2017 15:09:20 +0100 Subject: [PATCH] Bug 19690: Smart rules: Term "If any unavailable" is confusing and just means No Content-Type: text/plain; charset=utf-8 This patch replaces the term by No. Also "If all unavailable" is refined to "Only if other items unavailable". The online help text is adjusted. Two comments in DisallowHoldIfItemsAvailable.t are adjusted too. Test plan: Go to smart rules, look at on shelf holds. Read the help text for this page. Signed-off-by: Marcel de Rooy --- koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt | 2 +- .../intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt | 4 ++-- t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index 99c03d3..48dd416 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -297,9 +297,9 @@ $(document).ready(function() { [% IF rule.onshelfholds == 1 %] Yes [% ELSIF rule.onshelfholds == 2 %] - If all unavailable + Only if other items unavailable [% ELSE %] - If any unavailable + No [% END %] [% IF rule.opacitemholds == 'F'%]Force[% ELSIF rule.opacitemholds == 'Y'%]Allow[% ELSE %]Don't allow[% END %] @@ -393,8 +393,8 @@ $(document).ready(function() { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt index 1521046..ac4cbf5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt @@ -76,7 +76,7 @@
  • If the patron can place holds on this item type, enter the total numbers of items (of this type) that can be put on hold in the 'Holds Allowed' field
  • -
  • Next you can decide if this patron/item combo are allowed to place holds on items that are on the shelf (or available in the library) or not. If you choose 'no' then items can only be placed on hold if checked out
  • +
  • Next you can decide if this patron/item combo are allowed to place holds on items that are on the shelf (or available in the library). You can choose between Yes, No and "Only if other items unavailable".
  • You can also decide if patrons are allowed to place item specific holds on the item type in question. The options are:
    • Allow: Will allow patrons the option to choose next available or item specific
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt index dfae544..73ee8c4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt @@ -117,8 +117,8 @@ diff --git a/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t b/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t index 3c5fd72..98d5357 100755 --- a/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t +++ b/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t @@ -137,7 +137,7 @@ AddReturn( $item1->{barcode} ); Koha::Items->find( $item1->{itemnumber} )->set({homebranch => $library_B, holdingbranch => $library_B })->store; $item1 = GetItem( $itemnumber1 ); #Scenario is: - #One shelf holds is 'If all unavailable'/2 + #One shelf holds is 'Only if other items unavailable'/2 #Item 1 homebranch library B is available #Item 2 homebranch library A is checked out #Borrower1 is from library A @@ -177,7 +177,7 @@ AddReturn( $item1->{barcode} ); Koha::Items->find( $item1->{itemnumber} )->set({homebranch => $library_A, holdingbranch => $library_A })->store; $item1 = GetItem( $itemnumber1 ); #Scenario is: - #One shelf holds is 'If all unavailable'/2 + #One shelf holds is 'Only if other items unavailable'/2 #Item 1 homebranch library A is available #Item 2 homebranch library A is checked out #Borrower1 is from library A -- 2.1.4