From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 10 Jan 2020 17:37:53 +0000 (-0500)
Subject: Add metadata to is_primary fields
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b6673dcd31ab5d3246b1635a337690b88cdc7d68;p=civicrm-core.git

Add metadata to is_primary fields
---

diff --git a/CRM/Core/DAO/Address.php b/CRM/Core/DAO/Address.php
index cf17f99ac5..e0619a1a47 100644
--- a/CRM/Core/DAO/Address.php
+++ b/CRM/Core/DAO/Address.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Address.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6dabc95988fa66837c8f90b4ac68901c)
+ * (GenCodeChecksum:aed8175462599ecc4c8d43887d76350a)
  */
 
 /**
@@ -313,7 +313,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO {
         'is_primary' => [
           'name' => 'is_primary',
           'type' => CRM_Utils_Type::T_BOOLEAN,
-          'title' => ts('Is Address Primary?'),
+          'title' => ts('Primary address'),
           'description' => ts('Is this the primary address.'),
           'where' => 'civicrm_address.is_primary',
           'default' => '0',
@@ -322,7 +322,7 @@ class CRM_Core_DAO_Address extends CRM_Core_DAO {
           'bao' => 'CRM_Core_BAO_Address',
           'localizable' => 0,
           'html' => [
-            'type' => 'CheckBox',
+            'type' => 'Radio',
           ],
         ],
         'is_billing' => [
diff --git a/CRM/Core/DAO/Email.php b/CRM/Core/DAO/Email.php
index 12b8173e49..083c4064db 100644
--- a/CRM/Core/DAO/Email.php
+++ b/CRM/Core/DAO/Email.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Email.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:68301f75314731f6ee2ec37298fe49fe)
+ * (GenCodeChecksum:ae76175a9d3e57bc555ce90cac672e73)
  */
 
 /**
@@ -57,7 +57,7 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO {
   public $email;
 
   /**
-   * Is this the primary?
+   * Is this the primary email address
    *
    * @var bool
    */
@@ -210,14 +210,17 @@ class CRM_Core_DAO_Email extends CRM_Core_DAO {
         'is_primary' => [
           'name' => 'is_primary',
           'type' => CRM_Utils_Type::T_BOOLEAN,
-          'title' => ts('Is Primary email'),
-          'description' => ts('Is this the primary?'),
+          'title' => ts('Primary email'),
+          'description' => ts('Is this the primary email address'),
           'where' => 'civicrm_email.is_primary',
           'default' => '0',
           'table_name' => 'civicrm_email',
           'entity' => 'Email',
           'bao' => 'CRM_Core_BAO_Email',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Radio',
+          ],
         ],
         'is_billing' => [
           'name' => 'is_billing',
diff --git a/CRM/Core/DAO/IM.php b/CRM/Core/DAO/IM.php
index bb07bee65b..9562be99bc 100644
--- a/CRM/Core/DAO/IM.php
+++ b/CRM/Core/DAO/IM.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/IM.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e09b9168fc001341138686c827deba1f)
+ * (GenCodeChecksum:9ea5d47a6892a28874a633ca8c5ef92c)
  */
 
 /**
@@ -192,7 +192,7 @@ class CRM_Core_DAO_IM extends CRM_Core_DAO {
         'is_primary' => [
           'name' => 'is_primary',
           'type' => CRM_Utils_Type::T_BOOLEAN,
-          'title' => ts('Is IM Primary?'),
+          'title' => ts('Primary IM'),
           'description' => ts('Is this the primary IM for this contact and location.'),
           'where' => 'civicrm_im.is_primary',
           'default' => '0',
@@ -200,6 +200,9 @@ class CRM_Core_DAO_IM extends CRM_Core_DAO {
           'entity' => 'IM',
           'bao' => 'CRM_Core_BAO_IM',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Radio',
+          ],
         ],
         'is_billing' => [
           'name' => 'is_billing',
diff --git a/CRM/Core/DAO/OpenID.php b/CRM/Core/DAO/OpenID.php
index 4b85ea7148..56fc736a9c 100644
--- a/CRM/Core/DAO/OpenID.php
+++ b/CRM/Core/DAO/OpenID.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/OpenID.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:4ff4afe262a2f93f500559f17f096ae8)
+ * (GenCodeChecksum:4baa608e9caa3e118ac02d28032b8bc2)
  */
 
 /**
@@ -170,7 +170,7 @@ class CRM_Core_DAO_OpenID extends CRM_Core_DAO {
         'is_primary' => [
           'name' => 'is_primary',
           'type' => CRM_Utils_Type::T_BOOLEAN,
-          'title' => ts('Is OpenID Primary?'),
+          'title' => ts('Primary ID'),
           'description' => ts('Is this the primary email for this contact and location.'),
           'where' => 'civicrm_openid.is_primary',
           'default' => '0',
@@ -178,6 +178,9 @@ class CRM_Core_DAO_OpenID extends CRM_Core_DAO {
           'entity' => 'OpenID',
           'bao' => 'CRM_Core_BAO_OpenID',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Radio',
+          ],
         ],
       ];
       CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'fields_callback', Civi::$statics[__CLASS__]['fields']);
diff --git a/CRM/Core/DAO/Phone.php b/CRM/Core/DAO/Phone.php
index d2c869ffc9..f0b7498084 100644
--- a/CRM/Core/DAO/Phone.php
+++ b/CRM/Core/DAO/Phone.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Phone.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:8298e3f0ae875f23de4b0c6a737e94c6)
+ * (GenCodeChecksum:76a7202934e0d8aa7f4240c61a42e42c)
  */
 
 /**
@@ -175,7 +175,7 @@ class CRM_Core_DAO_Phone extends CRM_Core_DAO {
         'is_primary' => [
           'name' => 'is_primary',
           'type' => CRM_Utils_Type::T_BOOLEAN,
-          'title' => ts('Is Phone Primary?'),
+          'title' => ts('Primary phone'),
           'description' => ts('Is this the primary phone for this contact and location.'),
           'where' => 'civicrm_phone.is_primary',
           'default' => '0',
@@ -183,6 +183,9 @@ class CRM_Core_DAO_Phone extends CRM_Core_DAO {
           'entity' => 'Phone',
           'bao' => 'CRM_Core_BAO_Phone',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Radio',
+          ],
         ],
         'is_billing' => [
           'name' => 'is_billing',
diff --git a/xml/schema/Core/Address.xml b/xml/schema/Core/Address.xml
index 4f78884066..49bbcc38b5 100644
--- a/xml/schema/Core/Address.xml
+++ b/xml/schema/Core/Address.xml
@@ -57,13 +57,13 @@
   </index>
   <field>
     <name>is_primary</name>
-    <title>Is Address Primary?</title>
+    <title>Primary address</title>
     <type>boolean</type>
     <default>0</default>
     <comment>Is this the primary address.</comment>
     <add>2.0</add>
     <html>
-      <type>CheckBox</type>
+      <type>Radio</type>
     </html>
   </field>
   <index>
diff --git a/xml/schema/Core/Email.xml b/xml/schema/Core/Email.xml
index c9881ac4f8..90f7a7bef5 100644
--- a/xml/schema/Core/Email.xml
+++ b/xml/schema/Core/Email.xml
@@ -76,18 +76,14 @@
   </index>
   <field>
     <name>is_primary</name>
+    <title>Primary email</title>
     <type>boolean</type>
     <default>0</default>
-    <comment>Is this the primary email for this contact and location.</comment>
+    <comment>Is this the primary email address</comment>
     <add>1.1</add>
-  </field>
-  <field>
-    <name>is_primary</name>
-    <title>Is Primary email</title>
-    <type>boolean</type>
-    <default>0</default>
-    <comment>Is this the primary?</comment>
-    <add>2.0</add>
+    <html>
+      <type>Radio</type>
+    </html>
   </field>
   <index>
     <name>index_is_primary</name>
diff --git a/xml/schema/Core/IM.xml b/xml/schema/Core/IM.xml
index ce4e3961e6..74b0cd8e6c 100644
--- a/xml/schema/Core/IM.xml
+++ b/xml/schema/Core/IM.xml
@@ -87,9 +87,12 @@
   </index>
   <field>
     <name>is_primary</name>
-    <title>Is IM Primary?</title>
+    <title>Primary IM</title>
     <type>boolean</type>
     <default>0</default>
+    <html>
+      <type>Radio</type>
+    </html>
     <comment>Is this the primary IM for this contact and location.</comment>
     <add>1.1</add>
   </field>
diff --git a/xml/schema/Core/OpenID.xml b/xml/schema/Core/OpenID.xml
index a7b2e2aba9..1aa5c579f6 100644
--- a/xml/schema/Core/OpenID.xml
+++ b/xml/schema/Core/OpenID.xml
@@ -73,9 +73,12 @@
   </field>
   <field>
     <name>is_primary</name>
-    <title>Is OpenID Primary?</title>
+    <title>Primary ID</title>
     <type>boolean</type>
     <default>0</default>
+    <html>
+      <type>Radio</type>
+    </html>
     <comment>Is this the primary email for this contact and location.</comment>
     <add>2.0</add>
   </field>
diff --git a/xml/schema/Core/Phone.xml b/xml/schema/Core/Phone.xml
index f3703dc8f5..f6531dbf7c 100644
--- a/xml/schema/Core/Phone.xml
+++ b/xml/schema/Core/Phone.xml
@@ -55,9 +55,12 @@
   </index>
   <field>
     <name>is_primary</name>
-    <title>Is Phone Primary?</title>
+    <title>Primary phone</title>
     <type>boolean</type>
     <default>0</default>
+    <html>
+      <type>Radio</type>
+    </html>
     <comment>Is this the primary phone for this contact and location.</comment>
     <add>1.1</add>
   </field>