From 24317d892532444ee5acea80d8999de97fe63142 Mon Sep 17 00:00:00 2001 From: yashodha Date: Mon, 13 Feb 2017 16:28:01 +0530 Subject: [PATCH] CRM-19982: Can't enter dates in 4.7.16. Can only enter characters in word birth --- CRM/Activity/DAO/Activity.php | 4 ++-- CRM/Contact/DAO/Contact.php | 6 +++--- CRM/Contribute/DAO/Contribution.php | 12 ++++++------ CRM/Core/CodeGen/Specification.php | 2 +- CRM/Core/DAO/AllCoreTables.data.php | 2 +- CRM/Event/DAO/Participant.php | 4 ++-- CRM/Member/DAO/Membership.php | 8 ++++---- xml/schema/Activity/Activity.xml | 2 +- xml/schema/Contact/Contact.xml | 4 ++-- xml/schema/Contribute/Contribution.xml | 10 +++++----- xml/schema/Event/Participant.xml | 2 +- xml/schema/Member/Membership.xml | 6 +++--- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/CRM/Activity/DAO/Activity.php b/CRM/Activity/DAO/Activity.php index 5cbc7a0d8c..26a5ec64c8 100644 --- a/CRM/Activity/DAO/Activity.php +++ b/CRM/Activity/DAO/Activity.php @@ -30,7 +30,7 @@ * * Generated from xml/schema/CRM/Activity/Activity.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:0dd661946f59d928e2b928c3c3f67d44) + * (GenCodeChecksum:e29dddab1cbaae042d11ea6e022f3dd5) */ require_once 'CRM/Core/DAO.php'; require_once 'CRM/Utils/Type.php'; @@ -309,7 +309,7 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'bao' => 'CRM_Activity_BAO_Activity', 'html' => array( 'type' => 'Select Date', - 'format' => 'activityDateTime', + 'formatType' => 'activityDateTime', ) , ) , 'activity_duration' => array( diff --git a/CRM/Contact/DAO/Contact.php b/CRM/Contact/DAO/Contact.php index dd66d1e924..0f375714fc 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:0c8e687501dbd8f44354ee5f5cdf9b52) + * (GenCodeChecksum:b16421c318c1224c65e18a9e2aa15a5e) */ require_once 'CRM/Core/DAO.php'; require_once 'CRM/Utils/Type.php'; @@ -1114,7 +1114,7 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'bao' => 'CRM_Contact_BAO_Contact', 'html' => array( 'type' => 'Select Date', - 'format' => 'birth', + 'formatType' => 'birth', ) , ) , 'is_deceased' => array( @@ -1148,7 +1148,7 @@ class CRM_Contact_DAO_Contact extends CRM_Core_DAO { 'bao' => 'CRM_Contact_BAO_Contact', 'html' => array( 'type' => 'Select Date', - 'format' => 'birth', + 'formatType' => 'birth', ) , ) , 'household_name' => array( diff --git a/CRM/Contribute/DAO/Contribution.php b/CRM/Contribute/DAO/Contribution.php index 5dbd758464..0a1a2f3eb3 100644 --- a/CRM/Contribute/DAO/Contribution.php +++ b/CRM/Contribute/DAO/Contribution.php @@ -30,7 +30,7 @@ * * Generated from xml/schema/CRM/Contribute/Contribution.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:00dd1e00a61c69190a0eefd88d49415e) + * (GenCodeChecksum:b25399b3b6cf17e97809102666de8ee7) */ require_once 'CRM/Core/DAO.php'; require_once 'CRM/Utils/Type.php'; @@ -362,7 +362,7 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'bao' => 'CRM_Contribute_BAO_Contribution', 'html' => array( 'type' => 'Select Date', - 'format' => 'activityDateTime', + 'formatType' => 'activityDateTime', ) , ) , 'non_deductible_amount' => array( @@ -529,7 +529,7 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'bao' => 'CRM_Contribute_BAO_Contribution', 'html' => array( 'type' => 'Select Date', - 'format' => 'activityDateTime', + 'formatType' => 'activityDateTime', ) , ) , 'cancel_reason' => array( @@ -563,7 +563,7 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'bao' => 'CRM_Contribute_BAO_Contribution', 'html' => array( 'type' => 'Select Date', - 'format' => 'activityDateTime', + 'formatType' => 'activityDateTime', ) , ) , 'thankyou_date' => array( @@ -581,7 +581,7 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'bao' => 'CRM_Contribute_BAO_Contribution', 'html' => array( 'type' => 'Select Date', - 'format' => 'activityDateTime', + 'formatType' => 'activityDateTime', ) , ) , 'contribution_source' => array( @@ -796,7 +796,7 @@ class CRM_Contribute_DAO_Contribution extends CRM_Core_DAO { 'bao' => 'CRM_Contribute_BAO_Contribution', 'html' => array( 'type' => 'Select Date', - 'format' => 'activityDateTime', + 'formatType' => 'activityDateTime', ) , ) , ); diff --git a/CRM/Core/CodeGen/Specification.php b/CRM/Core/CodeGen/Specification.php index dbebd3291f..2a94606859 100644 --- a/CRM/Core/CodeGen/Specification.php +++ b/CRM/Core/CodeGen/Specification.php @@ -365,7 +365,7 @@ class CRM_Core_CodeGen_Specification { if (!empty($field['html'])) { $validOptions = array( 'type', - 'format', + 'formatType', /* Fixme: prior to CRM-13497 these were in a flat structure // CRM-13497 moved them to be nested within 'html' but there's no point // making that change in the DAOs right now since we are in the process of diff --git a/CRM/Core/DAO/AllCoreTables.data.php b/CRM/Core/DAO/AllCoreTables.data.php index 4e8aa5d24d..26571f62ee 100644 --- a/CRM/Core/DAO/AllCoreTables.data.php +++ b/CRM/Core/DAO/AllCoreTables.data.php @@ -24,7 +24,7 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ */ -// (GenCodeChecksum:5846411ffbd219fb1d7ead90f03e49a4) +// (GenCodeChecksum:5a41993a5c97a2544f3cc2e4df8879e2) return array( 'CRM_Core_DAO_AddressFormat' => array( 'name' => 'AddressFormat', diff --git a/CRM/Event/DAO/Participant.php b/CRM/Event/DAO/Participant.php index b497955e61..8da34792f3 100644 --- a/CRM/Event/DAO/Participant.php +++ b/CRM/Event/DAO/Participant.php @@ -30,7 +30,7 @@ * * Generated from xml/schema/CRM/Event/Participant.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:3c53d2d7a62cf0428fef11b9df02fcd2) + * (GenCodeChecksum:87c3d1afa18e39e10ba019d773eb6ce8) */ require_once 'CRM/Core/DAO.php'; require_once 'CRM/Utils/Type.php'; @@ -310,7 +310,7 @@ class CRM_Event_DAO_Participant extends CRM_Core_DAO { 'bao' => 'CRM_Event_BAO_Participant', 'html' => array( 'type' => 'Select Date', - 'format' => 'activityDateTime', + 'formatType' => 'activityDateTime', ) , ) , 'participant_source' => array( diff --git a/CRM/Member/DAO/Membership.php b/CRM/Member/DAO/Membership.php index 45a038c724..a3cb6c7097 100644 --- a/CRM/Member/DAO/Membership.php +++ b/CRM/Member/DAO/Membership.php @@ -30,7 +30,7 @@ * * Generated from xml/schema/CRM/Member/Membership.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:794bd904da5edcacc20dd5784fcdcf0c) + * (GenCodeChecksum:d92ffd88f95da56ec5e4463369c59155) */ require_once 'CRM/Core/DAO.php'; require_once 'CRM/Utils/Type.php'; @@ -244,7 +244,7 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO { 'bao' => 'CRM_Member_BAO_Membership', 'html' => array( 'type' => 'Select Date', - 'format' => 'activityDate', + 'formatType' => 'activityDate', ) , ) , 'membership_start_date' => array( @@ -262,7 +262,7 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO { 'bao' => 'CRM_Member_BAO_Membership', 'html' => array( 'type' => 'Select Date', - 'format' => 'activityDate', + 'formatType' => 'activityDate', ) , ) , 'membership_end_date' => array( @@ -280,7 +280,7 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO { 'bao' => 'CRM_Member_BAO_Membership', 'html' => array( 'type' => 'Select Date', - 'format' => 'activityDate', + 'formatType' => 'activityDate', ) , ) , 'membership_source' => array( diff --git a/xml/schema/Activity/Activity.xml b/xml/schema/Activity/Activity.xml index 7065073100..b47eb8900b 100644 --- a/xml/schema/Activity/Activity.xml +++ b/xml/schema/Activity/Activity.xml @@ -134,7 +134,7 @@ Date and time this activity is scheduled to occur. Formerly named scheduled_date_time. Select Date - activityDateTime + activityDateTime 2.0 diff --git a/xml/schema/Contact/Contact.xml b/xml/schema/Contact/Contact.xml index 716c82edf3..6343cccc7e 100644 --- a/xml/schema/Contact/Contact.xml +++ b/xml/schema/Contact/Contact.xml @@ -668,7 +668,7 @@ 1.1 Select Date - birth + birth @@ -694,7 +694,7 @@ 1.5 Select Date - birth + birth diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml index 8c312e6bc2..7b9148732a 100644 --- a/xml/schema/Contribute/Contribution.xml +++ b/xml/schema/Contribute/Contribution.xml @@ -149,7 +149,7 @@ 1.3 Select Date - activityDateTime + activityDateTime @@ -265,7 +265,7 @@ 1.3 Select Date - activityDateTime + activityDateTime @@ -287,7 +287,7 @@ when (if) receipt was sent. populated automatically for online donations w/ automatic receipting Select Date - activityDateTime + activityDateTime 1.3 @@ -302,7 +302,7 @@ 1.3 Select Date - activityDateTime + activityDateTime @@ -516,7 +516,7 @@ Stores the date when revenue should be recognized. Select Date - activityDateTime + activityDateTime 4.7 diff --git a/xml/schema/Event/Participant.xml b/xml/schema/Event/Participant.xml index ca92ae4542..b35eb253b8 100644 --- a/xml/schema/Event/Participant.xml +++ b/xml/schema/Event/Participant.xml @@ -121,7 +121,7 @@ 1.7 Select Date - activityDateTime + activityDateTime diff --git a/xml/schema/Member/Membership.xml b/xml/schema/Member/Membership.xml index ad00f4dc14..7a51751bd7 100644 --- a/xml/schema/Member/Membership.xml +++ b/xml/schema/Member/Membership.xml @@ -82,7 +82,7 @@ 1.5 Select Date - activityDate + activityDate @@ -97,7 +97,7 @@ 1.5 Select Date - activityDate + activityDate @@ -112,7 +112,7 @@ 1.5 Select Date - activityDate + activityDate -- 2.25.1