From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 31 Oct 2015 23:09:12 +0000 (+0000)
Subject: CRM - 17471 Fix Issue where updated status labels aren't displayed in search
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9d4d481e3d8bbf5f5655f257bc11f74eb1ae5808;p=civicrm-core.git

CRM - 17471 Fix Issue where updated status labels aren't displayed in search

CRM-17471 Fix issue where updated statuses aren't represented in PseudoConstant, by flushing the cache

Change membershipStatus psuedoConstant to use label column not name

Alter buildSearchForm rather than PseudoConstant to be more safe
---

diff --git a/CRM/Member/BAO/MembershipStatus.php b/CRM/Member/BAO/MembershipStatus.php
index 4621a0b8f4..3ecd8ab164 100644
--- a/CRM/Member/BAO/MembershipStatus.php
+++ b/CRM/Member/BAO/MembershipStatus.php
@@ -148,6 +148,7 @@ class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus {
     $membershipStatus->id = $id;
 
     $membershipStatus->save();
+    CRM_Member_PseudoConstant::flush('membershipStatus');
     return $membershipStatus;
   }
 
@@ -207,6 +208,7 @@ class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus {
     $membershipStatus = new CRM_Member_DAO_MembershipStatus();
     $membershipStatus->id = $membershipStatusId;
     $membershipStatus->delete();
+    CRM_Member_PseudoConstant::flush('membershipStatus');
     $membershipStatus->free();
   }
 
diff --git a/CRM/Member/BAO/Query.php b/CRM/Member/BAO/Query.php
index 032f5a466e..0fff4dc3cb 100644
--- a/CRM/Member/BAO/Query.php
+++ b/CRM/Member/BAO/Query.php
@@ -396,7 +396,7 @@ class CRM_Member_BAO_Query {
    * @param CRM_Core_Form $form
    */
   public static function buildSearchForm(&$form) {
-    $membershipStatus = CRM_Member_PseudoConstant::membershipStatus();
+    $membershipStatus = CRM_Member_PseudoConstant::membershipStatus(NULL, NULL, 'label', FALSE, FALSE);
     $form->add('select', 'membership_status_id', ts('Membership Status(s)'), $membershipStatus, FALSE,
       array('id' => 'membership_status_id', 'multiple' => 'multiple', 'class' => 'crm-select2')
     );