Merge pull request #13742 from jitendrapurohit/core-771

dev/core#771 - Smart group with uf_group_id does not load contacts wi…
civicrm · Mar 18, 2019 · 9b9ba5a · 9b9ba5a
2 parents fb5f8d7 + ce023e5
commit 9b9ba5a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/CRM/Contact/BAO/SavedSearch.php b/CRM/Contact/BAO/SavedSearch.php
@@ -467,6 +467,7 @@ public static function saveSkippedElement(&$queryParams, $formValues) {
       'operator',
       'component_mode',
       'display_relationship_type',
+      'uf_group_id',
     );
     foreach ($specialElements as $element) {
       if (!empty($formValues[$element])) {

diff --git a/tests/phpunit/CRM/Contact/BAO/SavedSearchTest.php b/tests/phpunit/CRM/Contact/BAO/SavedSearchTest.php
@@ -143,6 +143,37 @@ public function testDateRange() {
     $this->assertEquals('01/01/2009', $result['participant_register_date_low']);
     $this->assertEquals('01/01/2018', $result['participant_register_date_high']);
   }
+
+  /**
+   * Test if skipped elements are correctly
+   * stored and retrieved as formvalues.
+   */
+  public function testSkippedElements() {
+    $relTypeID = $this->relationshipTypeCreate();
+    $savedSearch = new CRM_Contact_BAO_SavedSearch();
+    $formValues = array(
+      'operator' => 'AND',
+      'title' => 'testsmart',
+      'radio_ts' => 'ts_all',
+      'component_mode' => CRM_Contact_BAO_Query::MODE_CONTACTS,
+      'display_relationship_type' => "{$relTypeID}_a_b",
+      'uf_group_id' => 1,
+    );
+    $queryParams = array();
+    CRM_Contact_BAO_SavedSearch::saveSkippedElement($queryParams, $formValues);
+    $savedSearch->form_values = serialize($queryParams);
+    $savedSearch->save();
+
+    $result = CRM_Contact_BAO_SavedSearch::getFormValues(CRM_Core_DAO::singleValueQuery('SELECT LAST_INSERT_ID()'));
+    $expectedResult = array(
+      'operator' => 'AND',
+      'component_mode' => CRM_Contact_BAO_Query::MODE_CONTACTS,
+      'display_relationship_type' => "{$relTypeID}_a_b",
+      'uf_group_id' => 1,
+    );
+    $this->checkArrayEquals($result, $expectedResult);
+  }
+
   /**
    * Test if relative dates are stored correctly
    * in civicrm_saved_search table.