From adeda4f416eb03537cad8439fba5e2c1736ba59f Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Wed, 1 Sep 2021 16:24:52 +0000 Subject: [PATCH] Bug 28936: Add sort1/sort2 to borrowers.json MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit To Test: 1. Check the BorrowerMandatoryField and BorrowerUnwantedField system preferences, sort1 and sort2 cannot be hidden or required 2. Apply patch 3. Check the BorrowerMandatoryField and BorrowerUnwantedField system preferences again, you should see sort1 and sort2 4. Since sort1 and sort2 are now added to borrowers.json we must also check the system preferences PatronQuickAddFields & PatronDuplicateMatchingAddFields 5. They should both now include sort1 and sort2, check to make sure they work with these two system preferences 6. Look at the system preferences PatronSelfRegistrationBorrowerMandatoryField, PatronSelfRegistrationBorrowerUnwantedField, and PatronSelfModificationBorrowerUnwantedField 7. sort1 and sort2 should be disabled in these OPAC system preferences This patch does not attempt to add sort1 or sort2 to the self reg or borrower mod pages. If they should be added, which I am not sure they should, we should do so in a seperate bug Signed-off-by: Joonas Kylmälä Signed-off-by: Emmi Takkinen Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit 73a711b41ff7dd0ba4e35d7643a793a7addb7cfe) Signed-off-by: Fridolin Somers --- .../prog/en/modules/admin/preferences/borrowers.json | 4 +++- .../intranet-tmpl/prog/en/modules/admin/preferences/opac.pref | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/borrowers.json b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/borrowers.json index 62b75d2705..7922568bde 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/borrowers.json +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/borrowers.json @@ -51,5 +51,7 @@ "altcontactzipcode": "altcontactzipcode", "altcontactcountry": "altcontactcountry", "altcontactphone": "altcontactphone", - "smsalertnumber": "smsalertnumber" + "smsalertnumber": "smsalertnumber", + "sort1": "sort1", + "sort2": "sort2" } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index f1511c90bc..9f9ec8dd08 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -821,17 +821,19 @@ OPAC: - pref: PatronSelfRegistrationBorrowerMandatoryField type: modalselect source: borrowers + exclusions: sort1|sort2 - - "The following database columns will not appear on the patron self-registration screen:" - pref: PatronSelfRegistrationBorrowerUnwantedField type: modalselect source: borrowers - exclusions: branchcode + exclusions: branchcode|sort1|sort2 - - "The following database columns will not appear on the patron self-modification screen:" - pref: PatronSelfModificationBorrowerUnwantedField type: modalselect source: borrowers + exclusions: sort1|sort2 - - "Display the following additional instructions for patrons who self register via the OPAC ( HTML is allowed ):" - pref: PatronSelfRegistrationAdditionalInstructions -- 2.39.5