From 1901dd9631d8e274a50097dc3d3b05cb21ecd8d8 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 3 Mar 2021 19:23:29 +1300
Subject: [PATCH] Add description to saved search

---
 CRM/Contact/DAO/SavedSearch.php               | 27 ++++++++++++++++---
 CRM/Upgrade/Incremental/php/FiveThirtySix.php |  2 ++
 xml/schema/Contact/SavedSearch.xml            | 13 ++++++++-
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/CRM/Contact/DAO/SavedSearch.php b/CRM/Contact/DAO/SavedSearch.php
index 7ae09f365e..349075a5d9 100644
--- a/CRM/Contact/DAO/SavedSearch.php
+++ b/CRM/Contact/DAO/SavedSearch.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contact/SavedSearch.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:25d5385ad222a7a7290fd18b3a27af8a)
+ * (GenCodeChecksum:1ca4440b5a09843b5d87d595a6d826ef)
  */
 
 /**
@@ -115,12 +115,17 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO {
   public $created_date;
 
   /**
-   * When the search was lase modified.
+   * When the search was last modified.
    *
    * @var timestamp
    */
   public $modified_date;
 
+  /**
+   * @var text
+   */
+  public $description;
+
   /**
    * Class constructor.
    */
@@ -350,7 +355,7 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO {
           'name' => 'modified_date',
           'type' => CRM_Utils_Type::T_TIMESTAMP,
           'title' => ts('Modified Date'),
-          'description' => ts('When the search was lase modified.'),
+          'description' => ts('When the search was last modified.'),
           'required' => TRUE,
           'where' => 'civicrm_saved_search.modified_date',
           'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
@@ -360,6 +365,22 @@ class CRM_Contact_DAO_SavedSearch extends CRM_Core_DAO {
           'localizable' => 0,
           'add' => '5.36',
         ],
+        'description' => [
+          'name' => 'description',
+          'type' => CRM_Utils_Type::T_TEXT,
+          'title' => ts('Saved Search Description'),
+          'rows' => 2,
+          'cols' => 60,
+          'where' => 'civicrm_saved_search.description',
+          'table_name' => 'civicrm_saved_search',
+          'entity' => 'SavedSearch',
+          'bao' => 'CRM_Contact_BAO_SavedSearch',
+          'localizable' => 0,
+          'html' => [
+            'type' => 'TextArea',
+          ],
+          'add' => '5.36',
+        ],
       ];
       CRM_Core_DAO_AllCoreTables::invoke(__CLASS__, 'fields_callback', Civi::$statics[__CLASS__]['fields']);
     }
diff --git a/CRM/Upgrade/Incremental/php/FiveThirtySix.php b/CRM/Upgrade/Incremental/php/FiveThirtySix.php
index 0eb9278a9f..267c97325e 100644
--- a/CRM/Upgrade/Incremental/php/FiveThirtySix.php
+++ b/CRM/Upgrade/Incremental/php/FiveThirtySix.php
@@ -79,6 +79,8 @@ class CRM_Upgrade_Incremental_php_FiveThirtySix extends CRM_Upgrade_Incremental_
       'civicrm_saved_search', 'created_date', "timestamp NULL  DEFAULT CURRENT_TIMESTAMP COMMENT 'When the search was created.'");
     $this->addTask('core-issue#2422 - Add modified_date to civicrm_saved_search', 'addColumn',
       'civicrm_saved_search', 'modified_date', "timestamp NULL  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'When the search was last modified.'");
+    $this->addTask('core-issue#2422 - Add description to civicrm_saved_search', 'addColumn',
+      'civicrm_saved_search', 'description', "text DEFAULT NULL");
 
     $this->addTask('core-issue#2422 - Add constraints to civicrm_saved_search', 'taskAddConstraints');
 
diff --git a/xml/schema/Contact/SavedSearch.xml b/xml/schema/Contact/SavedSearch.xml
index d5bd5213f4..586dd30195 100644
--- a/xml/schema/Contact/SavedSearch.xml
+++ b/xml/schema/Contact/SavedSearch.xml
@@ -189,9 +189,20 @@
   <field>
     <name>modified_date</name>
     <type>timestamp</type>
-    <comment>When the search was lase modified.</comment>
+    <comment>When the search was last modified.</comment>
     <required>true</required>
     <default>CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP</default>
     <add>5.36</add>
   </field>
+  <field>
+    <name>description</name>
+    <type>text</type>
+    <title>Saved Search Description</title>
+    <html>
+      <type>TextArea</type>
+      <rows>2</rows>
+      <cols>60</cols>
+    </html>
+    <add>5.36</add>
+  </field>
 </table>
-- 
2.25.1