From e45b470799df6db2303f172d3cd8cbd7b64a39c4 Mon Sep 17 00:00:00 2001
From: Monish Deb <monish.deb@jmaconsulting.biz>
Date: Sat, 9 Apr 2022 07:35:54 +0530
Subject: [PATCH] revert Menu.is_public requiredness

---
 CRM/ACL/DAO/ACLEntityRole.php                             | 4 ++--
 CRM/Upgrade/Incremental/php/FiveFortyNine/ACL.bool.php    | 4 +++-
 CRM/Upgrade/Incremental/php/FiveFortyNine/Report.bool.php | 6 +-----
 xml/schema/ACL/ACLEntityRole.xml                          | 2 +-
 xml/schema/Event/ParticipantStatusType.xml                | 3 +--
 xml/schema/Financial/PaymentProcessorType.xml             | 2 --
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/CRM/ACL/DAO/ACLEntityRole.php b/CRM/ACL/DAO/ACLEntityRole.php
index 5d03b57ff5..b88aceb5d6 100644
--- a/CRM/ACL/DAO/ACLEntityRole.php
+++ b/CRM/ACL/DAO/ACLEntityRole.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/ACL/ACLEntityRole.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:9c4c402f2b82415b38365ed3293e0b26)
+ * (GenCodeChecksum:b7a657943e1cf6e84d93e4b729fe7d10)
  */
 
 /**
@@ -188,7 +188,7 @@ class CRM_ACL_DAO_ACLEntityRole extends CRM_Core_DAO {
           'description' => ts('Is this property active?'),
           'required' => TRUE,
           'where' => 'civicrm_acl_entity_role.is_active',
-          'default' => '0',
+          'default' => '1',
           'table_name' => 'civicrm_acl_entity_role',
           'entity' => 'ACLEntityRole',
           'bao' => 'CRM_ACL_BAO_ACLEntityRole',
diff --git a/CRM/Upgrade/Incremental/php/FiveFortyNine/ACL.bool.php b/CRM/Upgrade/Incremental/php/FiveFortyNine/ACL.bool.php
index bfabe0b6ba..3eaf4d9ec5 100644
--- a/CRM/Upgrade/Incremental/php/FiveFortyNine/ACL.bool.php
+++ b/CRM/Upgrade/Incremental/php/FiveFortyNine/ACL.bool.php
@@ -1,4 +1,6 @@
 <?php
 return [
-  // DAO changed, but nothing in upgrader?
+  'civicrm_acl_entity_role' => [
+    'is_active' => "DEFAULT 1 COMMENT 'Is this property active?'",
+  ],
 ];
diff --git a/CRM/Upgrade/Incremental/php/FiveFortyNine/Report.bool.php b/CRM/Upgrade/Incremental/php/FiveFortyNine/Report.bool.php
index 545e3ede8e..ec96aabdb8 100644
--- a/CRM/Upgrade/Incremental/php/FiveFortyNine/Report.bool.php
+++ b/CRM/Upgrade/Incremental/php/FiveFortyNine/Report.bool.php
@@ -1,11 +1,7 @@
 <?php
 return [
-  'civicrm_report_instance' => [
-    'is_active' => "DEFAULT 0 COMMENT 'Is this entry active?'",
-    'is_reserved' => "DEFAULT 0",
-  ],
   'civicrm_report_instance' => [
     'is_active' => "DEFAULT 1 COMMENT 'Is this entry active?'",
+    'is_reserved' => "DEFAULT 0",
   ],
-    // WTF
 ];
diff --git a/xml/schema/ACL/ACLEntityRole.xml b/xml/schema/ACL/ACLEntityRole.xml
index d4bab2912e..d7d710bfb1 100644
--- a/xml/schema/ACL/ACLEntityRole.xml
+++ b/xml/schema/ACL/ACLEntityRole.xml
@@ -62,7 +62,7 @@
     <title>ACL Entity Role is Active</title>
     <type>boolean</type>
     <comment>Is this property active?</comment>
-    <default>0</default>
+    <default>1</default>
     <required>true</required>
     <add>1.6</add>
   </field>
diff --git a/xml/schema/Event/ParticipantStatusType.xml b/xml/schema/Event/ParticipantStatusType.xml
index 5899eafec9..03d0265645 100644
--- a/xml/schema/Event/ParticipantStatusType.xml
+++ b/xml/schema/Event/ParticipantStatusType.xml
@@ -70,9 +70,8 @@
     <name>is_active</name>
     <title>Participant Status is Active</title>
     <type>boolean</type>
-    <default>1</default>
     <comment>whether this status type is active</comment>
-    <default>0</default>
+    <default>1</default>
     <required>true</required>
     <add>3.0</add>
   </field>
diff --git a/xml/schema/Financial/PaymentProcessorType.xml b/xml/schema/Financial/PaymentProcessorType.xml
index ab3e93b9ef..3d4f076f70 100644
--- a/xml/schema/Financial/PaymentProcessorType.xml
+++ b/xml/schema/Financial/PaymentProcessorType.xml
@@ -55,7 +55,6 @@
     <required>true</required>
     <comment>Is this processor active?</comment>
     <add>1.8</add>
-    <default>1</default>
   </field>
   <field>
     <name>is_default</name>
@@ -65,7 +64,6 @@
     <required>true</required>
     <comment>Is this processor the default?</comment>
     <add>1.8</add>
-    <default>0</default>
   </field>
   <index>
     <name>UI_name</name>
-- 
2.25.1