From bf956cd3572093ad7a3a66f1f9203f464b1f9fdf Mon Sep 17 00:00:00 2001
From: William Mortada <williammortada@thirdsectordesign.org>
Date: Sun, 3 Dec 2023 12:05:07 +0000
Subject: [PATCH] Make active flag required and labelled enabled

---
 ext/standaloneusers/CRM/Standaloneusers/DAO/Role.php        | 6 ++++--
 ext/standaloneusers/CRM/Standaloneusers/DAO/User.php        | 3 ++-
 .../managed/SavedSearch_Administer_Roles.mgd.php            | 2 +-
 .../managed/SavedSearch_Administer_Users.mgd.php            | 2 +-
 ext/standaloneusers/sql/auto_install.sql                    | 2 +-
 ext/standaloneusers/xml/schema/CRM/Standaloneusers/Role.xml | 2 ++
 ext/standaloneusers/xml/schema/CRM/Standaloneusers/User.xml | 1 +
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ext/standaloneusers/CRM/Standaloneusers/DAO/Role.php b/ext/standaloneusers/CRM/Standaloneusers/DAO/Role.php
index da14159592..31bc162368 100644
--- a/ext/standaloneusers/CRM/Standaloneusers/DAO/Role.php
+++ b/ext/standaloneusers/CRM/Standaloneusers/DAO/Role.php
@@ -6,7 +6,7 @@
  *
  * Generated from standaloneusers/xml/schema/CRM/Standaloneusers/Role.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:afe744210fe5b5d38bf16ae05677a749)
+ * (GenCodeChecksum:b027d757eff8ad3b630c304037699382)
  */
 use CRM_Standaloneusers_ExtensionUtil as E;
 
@@ -87,7 +87,7 @@ class CRM_Standaloneusers_DAO_Role extends CRM_Core_DAO {
   /**
    * Only active roles grant permissions
    *
-   * @var bool|string|null
+   * @var bool|string
    *   (SQL type: tinyint)
    *   Note that values will be retrieved from the database as a string.
    */
@@ -221,6 +221,7 @@ class CRM_Standaloneusers_DAO_Role extends CRM_Core_DAO {
           'type' => CRM_Utils_Type::T_BOOLEAN,
           'title' => E::ts('Role is active'),
           'description' => E::ts('Only active roles grant permissions'),
+          'required' => TRUE,
           'usage' => [
             'import' => FALSE,
             'export' => FALSE,
@@ -235,6 +236,7 @@ class CRM_Standaloneusers_DAO_Role extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'CheckBox',
+            'label' => E::ts("Enabled"),
           ],
           'add' => NULL,
         ],
diff --git a/ext/standaloneusers/CRM/Standaloneusers/DAO/User.php b/ext/standaloneusers/CRM/Standaloneusers/DAO/User.php
index b1e6f21b31..f06e5c4a56 100644
--- a/ext/standaloneusers/CRM/Standaloneusers/DAO/User.php
+++ b/ext/standaloneusers/CRM/Standaloneusers/DAO/User.php
@@ -6,7 +6,7 @@
  *
  * Generated from standaloneusers/xml/schema/CRM/Standaloneusers/User.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:bb2c741901a689ff804ab65d05c7795b)
+ * (GenCodeChecksum:08b152ee7b327be88d44e2fce7c528ea)
  */
 use CRM_Standaloneusers_ExtensionUtil as E;
 
@@ -481,6 +481,7 @@ class CRM_Standaloneusers_DAO_User extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'CheckBox',
+            'label' => E::ts("Enabled"),
           ],
           'add' => NULL,
         ],
diff --git a/ext/standaloneusers/managed/SavedSearch_Administer_Roles.mgd.php b/ext/standaloneusers/managed/SavedSearch_Administer_Roles.mgd.php
index daf5cb3772..a17ed750e7 100644
--- a/ext/standaloneusers/managed/SavedSearch_Administer_Roles.mgd.php
+++ b/ext/standaloneusers/managed/SavedSearch_Administer_Roles.mgd.php
@@ -76,7 +76,7 @@ return [
               'type' => 'field',
               'key' => 'is_active',
               'dataType' => 'Boolean',
-              'label' => E::ts('Active'),
+              'label' => E::ts('Enabled'),
               'sortable' => TRUE,
               'rewrite' => '',
               'alignment' => '',
diff --git a/ext/standaloneusers/managed/SavedSearch_Administer_Users.mgd.php b/ext/standaloneusers/managed/SavedSearch_Administer_Users.mgd.php
index dccaaeb660..bce679c4cd 100644
--- a/ext/standaloneusers/managed/SavedSearch_Administer_Users.mgd.php
+++ b/ext/standaloneusers/managed/SavedSearch_Administer_Users.mgd.php
@@ -91,7 +91,7 @@ return [
               'type' => 'field',
               'key' => 'is_active',
               'dataType' => 'Boolean',
-              'label' => E::ts('Active?'),
+              'label' => E::ts('Enabled'),
               'sortable' => TRUE,
               'editable' => TRUE,
             ],
diff --git a/ext/standaloneusers/sql/auto_install.sql b/ext/standaloneusers/sql/auto_install.sql
index ec2f3676e9..9a482bb76e 100644
--- a/ext/standaloneusers/sql/auto_install.sql
+++ b/ext/standaloneusers/sql/auto_install.sql
@@ -39,7 +39,7 @@ CREATE TABLE `civicrm_role` (
   `name` varchar(60) NOT NULL COMMENT 'Machine name for this role',
   `label` varchar(128) NOT NULL COMMENT 'Human friendly name for this role',
   `permissions` text NOT NULL COMMENT 'List of permissions granted by this role',
-  `is_active` tinyint DEFAULT 1 COMMENT 'Only active roles grant permissions',
+  `is_active` tinyint NOT NULL DEFAULT 1 COMMENT 'Only active roles grant permissions',
   PRIMARY KEY (`id`)
 )
 ENGINE=InnoDB;
diff --git a/ext/standaloneusers/xml/schema/CRM/Standaloneusers/Role.xml b/ext/standaloneusers/xml/schema/CRM/Standaloneusers/Role.xml
index f83aa46181..a437a1c45b 100644
--- a/ext/standaloneusers/xml/schema/CRM/Standaloneusers/Role.xml
+++ b/ext/standaloneusers/xml/schema/CRM/Standaloneusers/Role.xml
@@ -68,8 +68,10 @@
     <comment>Only active roles grant permissions</comment>
     <type>boolean</type>
     <default>1</default>
+    <required>true</required>
     <html>
       <type>CheckBox</type>
+      <label>Enabled</label>
     </html>
   </field>
 
diff --git a/ext/standaloneusers/xml/schema/CRM/Standaloneusers/User.xml b/ext/standaloneusers/xml/schema/CRM/Standaloneusers/User.xml
index 8b9917f48c..4013223680 100644
--- a/ext/standaloneusers/xml/schema/CRM/Standaloneusers/User.xml
+++ b/ext/standaloneusers/xml/schema/CRM/Standaloneusers/User.xml
@@ -163,6 +163,7 @@
     <required>true</required>
     <html>
       <type>CheckBox</type>
+      <label>Enabled</label>
     </html>
   </field>
 
-- 
2.25.1