Re-order owner_membership_id field options so that primary members on…

…ly and non-primary-members-only filters are at the top
civicrm · Jun 19, 2019 · 8db9dd0 · 8db9dd0
1 parent a6d4b20
commit 8db9dd0
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/CRM/Report/Form/Member/ContributionDetail.php b/CRM/Report/Form/Member/ContributionDetail.php
@@ -613,14 +613,21 @@ public function statistics(&$rows) {
   }
 
   public function getOperationPair($type = "string", $fieldName = NULL) {
-    $result = parent::getOperationPair($type, $fieldName);
-
     //re-name IS NULL/IS NOT NULL for clarity
     if ($fieldName == 'owner_membership_id') {
+      $result = [];
       $result['nll'] = ts('Primary members only');
       $result['nnll'] = ts('Non-primary members only');
+      $options = parent::getOperationPair($type, $fieldName);
+      foreach ($options as $key => $label) {
+        if (!array_key_exists($key, $result)) {
+          $result[$key] = $label;
+        }
+      }
+    }
+     else {
+       $result = parent::getOperationPair($type, $fieldName);
     }
-
     return $result;
   }
 

diff --git a/CRM/Report/Form/Member/Detail.php b/CRM/Report/Form/Member/Detail.php
@@ -285,14 +285,21 @@ public function from() {
   }
 
   public function getOperationPair($type = "string", $fieldName = NULL) {
-    $result = parent::getOperationPair($type, $fieldName);
-
     //re-name IS NULL/IS NOT NULL for clarity
     if ($fieldName == 'owner_membership_id') {
+      $result = [];
       $result['nll'] = ts('Primary members only');
       $result['nnll'] = ts('Non-primary members only');
+      $options = parent::getOperationPair($type, $fieldName);
+      foreach ($options as $key => $label) {
+        if (!array_key_exists($key, $result)) {
+          $result[$key] = $label;
+        }
+      }
+    }
+     else {
+       $result = parent::getOperationPair($type, $fieldName);
     }
-
     return $result;
   }
 

diff --git a/CRM/Report/Form/Member/Summary.php b/CRM/Report/Form/Member/Summary.php
@@ -437,14 +437,21 @@ public function postProcess() {
   }
 
   public function getOperationPair($type = "string", $fieldName = NULL) {
-    $result = parent::getOperationPair($type, $fieldName);
-
     //re-name IS NULL/IS NOT NULL for clarity
     if ($fieldName == 'owner_membership_id') {
+      $result = [];
       $result['nll'] = ts('Primary members only');
       $result['nnll'] = ts('Non-primary members only');
+      $options = parent::getOperationPair($type, $fieldName);
+      foreach ($options as $key => $label) {
+        if (!array_key_exists($key, $result)) {
+          $result[$key] = $label;
+        }
+      }
+    }
+     else {
+       $result = parent::getOperationPair($type, $fieldName);
     }
-
     return $result;
   }