From cd063b107ed594363ceb555e4c6a6304b1e6da63 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Tue, 3 Jan 2017 23:07:36 -0500 Subject: [PATCH] CRM-19770 - Add is_star column to civicrm_activity --- CRM/Activity/DAO/Activity.php | 19 ++++++++++++++++++- CRM/Core/DAO/AllCoreTables.data.php | 2 +- CRM/Upgrade/Incremental/php/FourSeven.php | 2 ++ api/v3/examples/Activity/Create.php | 1 + xml/schema/Activity/Activity.xml | 10 ++++++++++ 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/CRM/Activity/DAO/Activity.php b/CRM/Activity/DAO/Activity.php index 8dab080dc0..a4cb37c0e2 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:c9a4e687808af7624ecb22a5f328b3a4) + * (GenCodeChecksum:9f8fd18414364d34516134b9d931ac02) */ require_once 'CRM/Core/DAO.php'; require_once 'CRM/Utils/Type.php'; @@ -187,6 +187,12 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { * @var int */ public $weight; + /** + * Activity marked as favorite. + * + * @var boolean + */ + public $is_star; /** * class constructor * @@ -524,6 +530,17 @@ class CRM_Activity_DAO_Activity extends CRM_Core_DAO { 'type' => 'Text', ) , ) , + 'is_star' => array( + 'name' => 'is_star', + 'type' => CRM_Utils_Type::T_BOOLEAN, + 'title' => ts('Is Starred') , + 'description' => 'Activity marked as favorite.', + 'import' => true, + 'where' => 'civicrm_activity.is_star', + 'headerPattern' => '/(activity.)?(star|favorite)/i', + 'dataPattern' => '', + 'export' => true, + ) , ); CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'fields_callback', Civi::$statics[__CLASS__]['fields']); } diff --git a/CRM/Core/DAO/AllCoreTables.data.php b/CRM/Core/DAO/AllCoreTables.data.php index 4bcc9b1564..ea2f5534d4 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:1f9e47fc8d0661ec0b31d4cbbba6783c) +// (GenCodeChecksum:91eca27988f62050330654fa6ce26ca2) return array( 'CRM_Core_DAO_AddressFormat' => array( 'name' => 'AddressFormat', diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php index a1e54cfd3d..a3676d7f79 100644 --- a/CRM/Upgrade/Incremental/php/FourSeven.php +++ b/CRM/Upgrade/Incremental/php/FourSeven.php @@ -299,6 +299,8 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base public function upgrade_4_7_16($rev) { $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev); $this->addTask('Add new CiviMail fields', 'addMailingTemplateType'); + $this->addTask('CRM-19770 - Add is_star column to civicrm_activity', 'addColumn', + 'civicrm_activity', 'is_star', "tinyint DEFAULT '0' COMMENT 'Activity marked as favorite.'"); } /* diff --git a/api/v3/examples/Activity/Create.php b/api/v3/examples/Activity/Create.php index ecb37836bb..eacee7ed30 100644 --- a/api/v3/examples/Activity/Create.php +++ b/api/v3/examples/Activity/Create.php @@ -76,6 +76,7 @@ function activity_create_expectedresult() { 'campaign_id' => '', 'engagement_level' => '', 'weight' => '', + 'is_star' => '', ), ), ); diff --git a/xml/schema/Activity/Activity.xml b/xml/schema/Activity/Activity.xml index 4948f49de8..e2589d56fa 100644 --- a/xml/schema/Activity/Activity.xml +++ b/xml/schema/Activity/Activity.xml @@ -458,4 +458,14 @@ Text + + is_star + Is Starred + boolean + 0 + true + Activity marked as favorite. + /(activity.)?(star|favorite)/i + 4.7 + -- 2.25.1