From 110684e45f1dfe8e2abe1f243be91ea500820de0 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 24 Jul 2019 11:54:57 +1200
Subject: [PATCH] Add titles to Mapping xml & DAOs

---
 CRM/Core/DAO/Mapping.php         |  4 ++--
 CRM/Core/DAO/MappingField.php    | 12 ++++++------
 xml/schema/Core/Mapping.xml      |  2 ++
 xml/schema/Core/MappingField.xml |  8 ++++++++
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/CRM/Core/DAO/Mapping.php b/CRM/Core/DAO/Mapping.php
index 9de2b93fc9..c6ca25411a 100644
--- a/CRM/Core/DAO/Mapping.php
+++ b/CRM/Core/DAO/Mapping.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Mapping.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3014bcc2b0a9647bad0431f586015208)
+ * (GenCodeChecksum:a1f0faf7e338aa60dfb0243ee1543f28)
  */
 
 /**
@@ -87,7 +87,7 @@ class CRM_Core_DAO_Mapping extends CRM_Core_DAO {
         'name' => [
           'name' => 'name',
           'type' => CRM_Utils_Type::T_STRING,
-          'title' => ts('Name'),
+          'title' => ts('Mapping Name'),
           'description' => ts('Name of Mapping'),
           'maxlength' => 64,
           'size' => CRM_Utils_Type::BIG,
diff --git a/CRM/Core/DAO/MappingField.php b/CRM/Core/DAO/MappingField.php
index e9038951ab..7a6920665c 100644
--- a/CRM/Core/DAO/MappingField.php
+++ b/CRM/Core/DAO/MappingField.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/MappingField.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:686d35f36c7a1c577403930d0ec4dcd1)
+ * (GenCodeChecksum:c40af5559b03a60e0ca5588961b0f92d)
  */
 
 /**
@@ -186,7 +186,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO {
         'name' => [
           'name' => 'name',
           'type' => CRM_Utils_Type::T_STRING,
-          'title' => ts('Name'),
+          'title' => ts('Field Name (or unique reference)'),
           'description' => ts('Mapping field key'),
           'maxlength' => 255,
           'size' => CRM_Utils_Type::HUGE,
@@ -215,7 +215,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO {
         'column_number' => [
           'name' => 'column_number',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Column Number'),
+          'title' => ts('Column Number to map to'),
           'description' => ts('Column number for mapping set'),
           'required' => TRUE,
           'where' => 'civicrm_mapping_field.column_number',
@@ -239,7 +239,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO {
         'phone_type_id' => [
           'name' => 'phone_type_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Phone type ID'),
+          'title' => ts('Phone Type'),
           'description' => ts('Which type of phone does this number belongs.'),
           'where' => 'civicrm_mapping_field.phone_type_id',
           'table_name' => 'civicrm_mapping_field',
@@ -310,7 +310,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO {
         'grouping' => [
           'name' => 'grouping',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Grouping'),
+          'title' => ts('Field Grouping'),
           'description' => ts('Used to group mapping_field records into related sets (e.g. for criteria sets in search builder
       mappings).'),
           'where' => 'civicrm_mapping_field.grouping',
@@ -342,7 +342,7 @@ class CRM_Core_DAO_MappingField extends CRM_Core_DAO {
         'value' => [
           'name' => 'value',
           'type' => CRM_Utils_Type::T_STRING,
-          'title' => ts('Value'),
+          'title' => ts('Search builder where clause'),
           'description' => ts('SQL WHERE value for search-builder mapping fields.'),
           'maxlength' => 255,
           'size' => CRM_Utils_Type::HUGE,
diff --git a/xml/schema/Core/Mapping.xml b/xml/schema/Core/Mapping.xml
index f488d598fe..54ab26d3d0 100644
--- a/xml/schema/Core/Mapping.xml
+++ b/xml/schema/Core/Mapping.xml
@@ -21,6 +21,7 @@
   </primaryKey>
   <field>
     <name>name</name>
+    <title>Mapping Name</title>
     <type>varchar</type>
     <length>64</length>
     <comment>Name of Mapping</comment>
@@ -28,6 +29,7 @@
   </field>
   <field>
     <name>description</name>
+    <title>Description</title>
     <type>varchar</type>
     <length>255</length>
     <comment>Description of Mapping.</comment>
diff --git a/xml/schema/Core/MappingField.xml b/xml/schema/Core/MappingField.xml
index cfc0eb09c3..b6b4fe5ea1 100644
--- a/xml/schema/Core/MappingField.xml
+++ b/xml/schema/Core/MappingField.xml
@@ -35,6 +35,7 @@
   </foreignKey>
   <field>
     <name>name</name>
+    <title>Field Name (or unique reference)</title>
     <type>varchar</type>
     <length>255</length>
     <comment>Mapping field key</comment>
@@ -42,6 +43,7 @@
   </field>
   <field>
     <name>contact_type</name>
+    <title>Contact Type</title>
     <type>varchar</type>
     <length>64</length>
     <comment>Contact Type in mapping</comment>
@@ -52,6 +54,7 @@
   </field>
   <field>
     <name>column_number</name>
+    <title>Column Number to map to</title>
     <type>int unsigned</type>
     <required>true</required>
     <comment>Column number for mapping set</comment>
@@ -80,6 +83,7 @@
   </field>
   <field>
     <name>phone_type_id</name>
+    <title>Phone Type</title>
     <type>int unsigned</type>
     <title>Phone type ID</title>
     <comment>Which type of phone does this number belongs.</comment>
@@ -126,12 +130,14 @@
   </foreignKey>
   <field>
     <name>relationship_direction</name>
+    <title>Relationship Direction</title>
     <type>varchar</type>
     <length>6</length>
     <add>1.7</add>
   </field>
   <field>
     <name>grouping</name>
+    <title>Field Grouping</title>
     <type>int unsigned</type>
     <default>1</default>
     <comment>Used to group mapping_field records into related sets (e.g. for criteria sets in search builder
@@ -141,6 +147,7 @@
   <field>
     <name>operator</name>
     <type>varchar</type>
+    <title>Operator</title>
     <length>16</length>
     <type>enum</type>
     <comment>SQL WHERE operator for search-builder mapping fields (search criteria).</comment>
@@ -154,6 +161,7 @@
   </field>
   <field>
     <name>value</name>
+    <title>Search builder where clause</title>
     <type>varchar</type>
     <length>255</length>
     <comment>SQL WHERE value for search-builder mapping fields.</comment>
-- 
2.25.1