From a28e91983fdc8fdbdfdcdb384b15ae5ddb059d0c Mon Sep 17 00:00:00 2001 From: eileen Date: Mon, 4 Dec 2017 21:37:43 +1300 Subject: [PATCH] CRM-21474, CRM-21880 fix error in Contact schema causing test fail. The pseudoConstant was against the wrong field --- CRM/Contact/DAO/Contact.php | 10 +++++----- xml/schema/Contact/Contact.xml | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CRM/Contact/DAO/Contact.php b/CRM/Contact/DAO/Contact.php index 98a2c243e5..9c738c102f 100644 --- a/CRM/Contact/DAO/Contact.php +++ b/CRM/Contact/DAO/Contact.php @@ -30,7 +30,7 @@ * * Generated from xml/schema/CRM/Contact/Contact.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:1e87927c8c8bdec9acfe3c306bb711d4) + * (GenCodeChecksum:b1dbc34947126531f2fd11aaa30b14a5) */ require_once 'CRM/Core/DAO.php'; require_once 'CRM/Utils/Type.php'; @@ -1069,6 +1069,10 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'entity' => 'Contact', 'bao' => 'CRM_Contact_BAO_Contact', 'localizable' => 0, + 'pseudoconstant' => array( + 'optionGroupName' => 'addressee', + 'optionEditPath' => 'civicrm/admin/options/addressee', + ) ) , 'addressee_custom' => array( 'name' => 'addressee_custom', @@ -1089,10 +1093,6 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'html' => array( 'type' => 'Text', ) , - 'pseudoconstant' => array( - 'optionGroupName' => 'addressee', - 'optionEditPath' => 'civicrm/admin/options/addressee', - ) ) , 'addressee_display' => array( 'name' => 'addressee_display', diff --git a/xml/schema/Contact/Contact.xml b/xml/schema/Contact/Contact.xml index 428dc40b55..76acad1d61 100644 --- a/xml/schema/Contact/Contact.xml +++ b/xml/schema/Contact/Contact.xml @@ -603,6 +603,9 @@ Addressee ID FK to civicrm_option_value.id, that has to be valid registered Addressee. 3.0 + + addressee + addressee_custom @@ -615,9 +618,6 @@ Text - - addressee - addressee_display -- 2.25.1