From cc638c667a70e8ff3b3c802fa8de9bf38e1e3df9 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Wed, 28 Dec 2022 21:05:14 +0000
Subject: [PATCH] Bug 32544: Remove flags as option from several patron form
 related system preferences
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Because permissions aren't actually set via the patron edit
screens, these checkboxes have no real purpose or effect.

This removes flags from the selectable fields of the following
system preferences:

* PatronSelfModificationMandatoryField
* PatronSelfRegistrationBorrowerMandatoryField
* BorrowerMandatoryField
* PatronSelfModificationBorrowerUnwantedField
* PatronSelfRegistrationBorrowerUnwantedField

To test:
* Apply patch
* Verify that the checkbox for flags can no longer be set for
these preferences

Signed-off-by: Andrew Fuerste-Henry <andrewfh@dubcolib.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomás Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 44d8d2efffcb38d1d91fbc8acfd1d1b13b854dbe)
Signed-off-by: Jacob O'Mara <jacob.omara@ptfs-europe.com>
---
 .../prog/en/modules/admin/preferences/opac.pref           | 8 ++++----
 .../prog/en/modules/admin/preferences/patrons.pref        | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

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 043c5276d8..09e4439b4e 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
@@ -762,25 +762,25 @@ OPAC:
             - pref: PatronSelfModificationMandatoryField
               type: modalselect
               source: borrowers
-              exclusions: password|cardnumber|dateexpiry|categorycode|sort1|sort2|opacnote|borrowernotes|gonenoaddress|lost
+              exclusions: password|cardnumber|dateexpiry|categorycode|sort1|sort2|opacnote|borrowernotes|gonenoaddress|lost|flags
         -
             - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> must be filled in on the patron entry screen:"
             - pref: PatronSelfRegistrationBorrowerMandatoryField
               type: modalselect
               source: borrowers
-              exclusions: sort1|sort2|opacnote|borrowernotes|gonenoaddress|lost
+              exclusions: sort1|sort2|opacnote|borrowernotes|gonenoaddress|lost|flags
         -
             - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-registration screen:"
             - pref: PatronSelfRegistrationBorrowerUnwantedField
               type: modalselect
               source: borrowers
-              exclusions: branchcode|sort1|sort2|gonenoaddress|lost
+              exclusions: branchcode|sort1|sort2|gonenoaddress|lost|flags
         -
             - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron self-modification screen:"
             - pref: PatronSelfModificationBorrowerUnwantedField
               type: modalselect
               source: borrowers
-              exclusions: sort1|sort2|gonenoaddress|lost
+              exclusions: sort1|sort2|gonenoaddress|lost|flags
         -
             - "Display the following additional instructions for patrons who self register via the OPAC ( HTML is allowed ):"
             - pref: PatronSelfRegistrationAdditionalInstructions
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
index f8f228e834..9ea2bea534 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
@@ -231,6 +231,7 @@ Patrons:
          - pref: BorrowerMandatoryField
            type: modalselect
            source: borrowers
+           exclusions: flags
          - '<strong>NOTE:</strong> If <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=autoMemberNum">autoMemberNum</a> is enabled, the system preference <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=BorrowerMandatoryField">BorrowerMandatoryField</a> must not contain the field <code>cardnumber</code>.'
      -
          - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> will not appear on the patron entry screen:"
-- 
2.20.1