Merge pull request #22851 from JMAConsulting/civiGrantFields

CiviGrant - Don't return grant fields as contact fields

ext/civigrant/CRM/Grant/BAO/Query.php

@@ -17,12 +17,16 @@
 class CRM_Grant_BAO_Query extends CRM_Contact_BAO_Query_Interface {
 
   /**
-   * Get grant fields.
+   * Unused.
+   *
+   * This function is meant to return extra contact fields, but grants are not contacts.
    *
    * @return array
    */
   public function &getFields() {
-    return CRM_Grant_BAO_Grant::exportableFields();
+    $fields = [];
+    return $fields;
+    // return CRM_Grant_BAO_Grant::exportableFields();
   }
 
   /**
@@ -65,6 +69,11 @@ public static function select(&$query) {
       $query->_tables['grant_note'] = 1;
     }
 
+    if (!empty($query->_returnProperties['grant_id'])) {
+      $query->_select['grant_id'] = "civicrm_grant.id as grant_id";
+      $query->_element['grant_id'] = 1;
+    }
+
     if ($query->_mode & CRM_Contact_BAO_Query::MODE_GRANT) {
       $query->_select['grant_amount_requested'] = 'civicrm_grant.amount_requested as grant_amount_requested';
       $query->_select['grant_amount_granted'] = 'civicrm_grant.amount_granted as grant_amount_granted';