Merge pull request civicrm#22171 from civicrm/5.44

5.44
eileenmcnaughton · Nov 30, 2021 · 0094bba · 0094bba
2 parents dfddd84 + 0961f3f
commit 0094bba
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/ext/oauth-client/Civi/Api4/OAuthProvider.php b/ext/oauth-client/Civi/Api4/OAuthProvider.php
@@ -62,6 +62,9 @@ public static function getFields($checkPermissions = TRUE) {
         [
           'name' => 'contactTemplate',
         ],
+        [
+          'name' => 'mailSettingsTemplate',
+        ],
       ];
     });
     return $action->setCheckPermissions($checkPermissions);

diff --git a/ext/search_kit/ang/crmSearchAdmin/crmSearchClause.component.js b/ext/search_kit/ang/crmSearchAdmin/crmSearchClause.component.js
@@ -61,16 +61,21 @@
         }
       }
 
-      this.getField = function(expr) {
+      // Gets the first arg of type "field"
+      function getFirstArgFromExpr(expr) {
         if (!(expr in meta)) {
           meta[expr] = _.findWhere(searchMeta.parseExpr(expr).args, {type: 'field'});
         }
-        return meta[expr] && meta[expr].field;
+        return meta[expr] || {};
+      }
+
+      this.getField = function(expr) {
+        return getFirstArgFromExpr(expr).field;
       };
 
       this.getOptionKey = function(expr) {
-        var field = ctrl.getField(expr) || {};
-        return field.suffix ? field.suffix.slice(1) : 'id';
+        var arg = getFirstArgFromExpr(expr);
+        return arg.suffix ? arg.suffix.slice(1) : 'id';
       };
 
       this.addGroup = function(op) {