From 26d514239ed66c4ff3eb583884764a12e5dbd494 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 12 Nov 2022 22:22:14 -0500
Subject: [PATCH] Afform - Fix multivalue entityRef fields

Apparently 'multiple' is a reserved word and wasn't working as an angular param,
switching it to 'multi' fixes the issue.
---
 ang/crmUi.js                                              | 4 ++--
 ext/afform/admin/ang/afGuiEditor/inputType/EntityRef.html | 2 +-
 ext/afform/core/ang/af/fields/EntityRef.html              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ang/crmUi.js b/ang/crmUi.js
index 0980423758..97e7402705 100644
--- a/ang/crmUi.js
+++ b/ang/crmUi.js
@@ -721,14 +721,14 @@
         bindToController: {
           crmAutocomplete: '<',
           crmAutocompleteParams: '<',
-          multiple: '<',
+          multi: '<',
           autoOpen: '<'
         },
         controller: function($element, $timeout) {
           var ctrl = this;
           $timeout(function() {
             $element.crmAutocomplete(ctrl.crmAutocomplete, ctrl.crmAutocompleteParams, {
-              multiple: ctrl.multiple,
+              multiple: ctrl.multi,
               minimumInputLength: ctrl.autoOpen ? 0 : 1
             });
             // Ensure widget is updated when model changes
diff --git a/ext/afform/admin/ang/afGuiEditor/inputType/EntityRef.html b/ext/afform/admin/ang/afGuiEditor/inputType/EntityRef.html
index d2538363fd..710e21010f 100644
--- a/ext/afform/admin/ang/afGuiEditor/inputType/EntityRef.html
+++ b/ext/afform/admin/ang/afGuiEditor/inputType/EntityRef.html
@@ -1,6 +1,6 @@
 <div class="form-inline">
   <div class="input-group">
-    <input autocomplete="off" type="text" class="form-control" placeholder="{{:: ts('Select %1', {1: $ctrl.getFkEntity().label}) }}" title="{{:: ts('Click to add placeholder text') }}" ng-model="getSet('input_attrs.placeholder')" ng-model-options="$ctrl.editor.debounceWithGetterSetter">
+    <input autocomplete="off" type="text" class="form-control" placeholder="{{:: ts('Select %1', {1: $ctrl.getFkEntity().label || $ctrl.getDefn().label }) }}" title="{{:: ts('Click to add placeholder text') }}" ng-model="getSet('input_attrs.placeholder')" ng-model-options="$ctrl.editor.debounceWithGetterSetter">
     <div class="input-group-btn">
       <button type="button" class="btn btn-default" disabled><i class="crm-i fa-search"></i></button>
     </div>
diff --git a/ext/afform/core/ang/af/fields/EntityRef.html b/ext/afform/core/ang/af/fields/EntityRef.html
index e2d0a60414..1b783ff44c 100644
--- a/ext/afform/core/ang/af/fields/EntityRef.html
+++ b/ext/afform/core/ang/af/fields/EntityRef.html
@@ -6,7 +6,7 @@
        ng-model-options="{getterSetter: true}"
        crm-autocomplete="$ctrl.defn.fk_entity"
        crm-autocomplete-params="{formName: 'afform:' + $ctrl.afFieldset.getFormName(), fieldName: $ctrl.afFieldset.modelName + ':' + $ctrl.fieldName}"
-       multiple="$ctrl.defn.input_attrs.multiple"
+       multi="$ctrl.defn.input_attrs.multiple"
        auto-open="$ctrl.defn.input_attrs.autoOpen"
        placeholder="{{:: $ctrl.defn.input_attrs.placeholder }}"
        ng-change="$ctrl.onSelectEntity()" >
-- 
2.25.1