Fix for test failure

diff --git a/CRM/Admin/Form/Mapping.php b/CRM/Admin/Form/Mapping.php
index 50284a82950c2936bcd392459a50645ce845483f..0a566648121045d2aff0cf597b2490e044ccc1f8 100644 (file)
--- a/CRM/Admin/Form/Mapping.php
+++ b/CRM/Admin/Form/Mapping.php
@@ -95,6 +95,7 @@ class CRM_Admin_Form_Mapping extends CRM_Admin_Form {
     if ($this->_action == CRM_Core_Action::DELETE) {
       if ($this->_id) {
         CRM_Core_BAO_Mapping::del($this->_id);
+        CRM_Core_Session::setStatus(ts('Selected mapping has been deleted successfully.'), ts('Deleted'), 'success');
       }
     }
     else {

diff --git a/CRM/Core/BAO/Mapping.php b/CRM/Core/BAO/Mapping.php
index 533c14c5baffe75e7ff654b132b02c5ba9b22356..004b769c2b33b6660b82b802a313c1f9534748d8 100644 (file)
--- a/CRM/Core/BAO/Mapping.php
+++ b/CRM/Core/BAO/Mapping.php
@@ -82,7 +82,6 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping {
     $mapping->id = $id;
     if ($mapping->find(TRUE)) {
       $result = $mapping->delete();
-      CRM_Core_Session::setStatus(ts('Selected mapping has been deleted successfully.'), ts('Deleted'), 'success');
       return $result;
     }
     return FALSE;

diff --git a/xml/schema/Core/Mapping.xml b/xml/schema/Core/Mapping.xml
index 692f6b4534adc131d0cd8685565278601c7347fa..f488d598fe518d15eae8baf273e33d50f8e4b8d3 100644 (file)
--- a/xml/schema/Core/Mapping.xml
+++ b/xml/schema/Core/Mapping.xml
@@ -9,6 +9,7 @@
   <field>
     <name>id</name>
     <type>int unsigned</type>
+    <title>Mapping ID</title>
     <required>true</required>
     <comment>Mapping ID</comment>
     <add>1.2</add>
@@ -45,6 +46,7 @@
   <field>
     <name>mapping_type_id</name>
     <type>int unsigned</type>
+    <title>Mapping Type</title>
     <comment>Mapping Type</comment>
     <add>2.1</add>
     <pseudoconstant>

diff --git a/xml/schema/Core/MappingField.xml b/xml/schema/Core/MappingField.xml
index e7c8606fe42ced0b9d87738060149ea2435213b2..5019953edbea4c2b70afdb2acef44772cccd808e 100644 (file)
--- a/xml/schema/Core/MappingField.xml
+++ b/xml/schema/Core/MappingField.xml
@@ -9,6 +9,7 @@
   <field>
     <name>id</name>
     <type>int unsigned</type>
+    <title>Mapping Field ID</title>
     <required>true</required>
     <comment>Mapping Field ID</comment>
     <add>1.2</add>
@@ -21,6 +22,7 @@
   <field>
     <name>mapping_id</name>
     <type>int unsigned</type>
+    <title>Mapping ID</title>
     <required>true</required>
     <comment>Mapping to which this field belongs</comment>
     <add>1.2</add>
@@ -58,6 +60,7 @@
   <field>
     <name>location_type_id</name>
     <type>int unsigned</type>
+    <title>Location type ID</title>
     <comment>Location type of this mapping, if required</comment>
     <add>1.2</add>
   </field>
@@ -78,12 +81,14 @@
   <field>
     <name>phone_type_id</name>
     <type>int unsigned</type>
+    <title>Phone type ID</title>
     <comment>Which type of phone does this number belongs.</comment>
     <add>2.2</add>
   </field>
   <field>
     <name>im_provider_id</name>
     <type>int unsigned</type>
+    <title>IM provider ID</title>
     <comment>Which type of IM Provider does this name belong.</comment>
     <add>3.0</add>
     <pseudoconstant>