projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f055d6d)
Make civicrm.is_active required and default=1
authorSandor Semsey <sandor@es-progress.hu>
Tue, 10 Oct 2023 09:33:26 +0000 (11:33 +0200)
committercolemanw <coleman@civicrm.org>
Tue, 17 Oct 2023 15:17:27 +0000 (11:17 -0400)
CRM/ACL/DAO/ACL.php patch | blob | blame | history
CRM/Upgrade/Incremental/php/FiveSixtyEight.php patch | blob | blame | history
CRM/Upgrade/Incremental/sql/5.68.alpha1.mysql.tpl patch | blob | blame | history
xml/schema/ACL/ACL.xml patch | blob | blame | history

diff --git a/CRM/ACL/DAO/ACL.php b/CRM/ACL/DAO/ACL.php
index 0a9b48d468695d736a440e0c03f19bb633e402ed..b9b28c82b0ac6566b831500cc9915d0e8abfcac7 100644 (file)
--- a/CRM/ACL/DAO/ACL.php
+++ b/CRM/ACL/DAO/ACL.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/ACL/ACL.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:56266204b43a487af7bf9963d23e0556)
+ * (GenCodeChecksum:d49159426e04e1bab16768e2f7ed9551)
  */
 
 /**
@@ -135,7 +135,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO {
   /**
    * Is this property active?
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -425,6 +425,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => ts('ACL Is Active?'),
           'description' => ts('Is this property active?'),
+          'required' => TRUE,
           'usage' => [
             'import' => FALSE,
             'export' => FALSE,
@@ -432,6 +433,7 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO {
             'token' => FALSE,
           ],
           'where' => 'civicrm_acl.is_active',
+          'default' => '1',
           'table_name' => 'civicrm_acl',
           'entity' => 'ACL',
           'bao' => 'CRM_ACL_BAO_ACL',
diff --git a/CRM/Upgrade/Incremental/php/FiveSixtyEight.php b/CRM/Upgrade/Incremental/php/FiveSixtyEight.php
index 93ca90b2cfa97e3baef5b31905f2fbdecfa0111a..94b675211208faf9fd31747317e2e233d2119abe 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FiveSixtyEight.php
+++ b/CRM/Upgrade/Incremental/php/FiveSixtyEight.php
@@ -37,6 +37,7 @@ class CRM_Upgrade_Incremental_php_FiveSixtyEight extends CRM_Upgrade_Incremental
     $this->addTask('Update civicrm_managed.module', 'alterColumn', 'civicrm_managed', 'module', "varchar(255) NOT NULL COMMENT 'Name of the module which declared this object (soft FK to civicrm_extension.full_name)'");
     $this->addTask('Update civicrm_managed.name', 'alterColumn', 'civicrm_managed', 'name', "varchar(255) NOT NULL COMMENT 'Symbolic name used by the module to identify the object'");
     $this->addTask('Update civicrm_managed.cleanup', 'alterColumn', 'civicrm_managed', 'cleanup', "varchar(16) NOT NULL DEFAULT 'always' COMMENT 'Policy on when to cleanup entity (always, never, unused)'");
+    $this->addTask('Update civicrm_acl.is_active', 'alterColumn', 'civicrm_acl', 'is_active', "tinyint NOT NULL DEFAULT 1 COMMENT 'Is this property active?'");
   }
 
 }
diff --git a/CRM/Upgrade/Incremental/sql/5.68.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.68.alpha1.mysql.tpl
index d7d9ad9e5571a42a192899f588cbf7ab1bd1b516..4f986d82be54fc8ac8d77d19599d6b71b0910993 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/5.68.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/5.68.alpha1.mysql.tpl
@@ -1,5 +1,7 @@
 {* file to handle db changes in 5.68.alpha1 during upgrade *}
 
+UPDATE `civicrm_acl` SET `is_active` = 0 WHERE `is_active` IS NULL;
+
 UPDATE `civicrm_tag` SET `label` = `name` WHERE `label` = '';
 
 {* This column is now required. Delete any null values; a managed entity without a name is useless *}
diff --git a/xml/schema/ACL/ACL.xml b/xml/schema/ACL/ACL.xml
index 1e058ab4732e428696113fec05935188547d6faa..94e143ce7f0b86b899990042a8a834d6a9538306 100644 (file)
--- a/xml/schema/ACL/ACL.xml
+++ b/xml/schema/ACL/ACL.xml
@@ -144,6 +144,8 @@
     <name>is_active</name>
     <title>ACL Is Active?</title>
     <type>boolean</type>
+    <required>true</required>
+    <default>1</default>
     <comment>Is this property active?</comment>
     <add>1.6</add>
     <html>