API Explorer: Don't show non-joinable fields as joinable

diff --git a/api/v3/utils.php b/api/v3/utils.php
index c232e0412e65537ab40e5ecdd9f49bba7236644b..1e5400b4197b7c0c6266c6fa765e0247afd45799 100644 (file)
--- a/api/v3/utils.php
+++ b/api/v3/utils.php
@@ -1887,8 +1887,10 @@ function _civicrm_api_get_fields($entity, $unique = FALSE, &$params = array()) {
   $d = new $dao();
   $fields = $d->fields();
 
-  // Set html attributes for text fields
   foreach ($fields as $name => &$field) {
+    // Denote as core field
+    $field['is_core_field'] = TRUE;
+    // Set html attributes for text fields
     if (isset($field['html'])) {
       $field['html'] += (array) $d::makeAttribute($field);
     }

diff --git a/templates/CRM/Admin/Page/APIExplorer.js b/templates/CRM/Admin/Page/APIExplorer.js
index bbcc7260954dd8483fe76dd8de9c054ae9090dd1..3bca15f509650d2449ba684b479ac2bc20904598 100644 (file)
--- a/templates/CRM/Admin/Page/APIExplorer.js
+++ b/templates/CRM/Admin/Page/APIExplorer.js
@@ -886,7 +886,7 @@
           var name = prefix + field.name;
           addJoinInfo(field, name);
           var entity = field.FKApiName;
-          if (entity) {
+          if (entity && field.is_core_field) {
             joinable[name] = {
               title: field.title + ' (' + field.FKApiName + ')',
               entity: entity,