From b534017eb8fb14996bd60d13e0ea0e893c32f412 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 23 Aug 2021 16:21:41 -0400
Subject: [PATCH] Afform - Fix setting default value

String comparison was failing for integer keys.
---
 .../admin/ang/afGuiEditor/elements/afGuiField.component.js     | 2 ++
 ext/afform/admin/ang/afGuiEditor/inputType/Select.html         | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js b/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js
index b20511ae61..2cc5e04a7d 100644
--- a/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js
+++ b/ext/afform/admin/ang/afGuiEditor/elements/afGuiField.component.js
@@ -236,11 +236,13 @@
       };
 
       $scope.defaultValueContains = function(val) {
+        val = '' + val;
         var defaultVal = getSet('afform_default');
         return defaultVal === val || (_.isArray(defaultVal) && _.includes(defaultVal, val));
       };
 
       $scope.toggleDefaultValueItem = function(val) {
+        val = '' + val;
         if (defaultValueShouldBeArray()) {
           if (!_.isArray(getSet('afform_default'))) {
             ctrl.node.defn.afform_default = [];
diff --git a/ext/afform/admin/ang/afGuiEditor/inputType/Select.html b/ext/afform/admin/ang/afGuiEditor/inputType/Select.html
index 33dd6f932b..1f5e849f20 100644
--- a/ext/afform/admin/ang/afGuiEditor/inputType/Select.html
+++ b/ext/afform/admin/ang/afGuiEditor/inputType/Select.html
@@ -6,6 +6,9 @@
       <div class="input-group-btn" af-gui-menu>
         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="crm-i fa-caret-down"></i></button>
         <ul class="dropdown-menu" ng-if="menu.open" title="{{:: ts('Set default value') }}">
+          <li class="disabled">
+            <a><strong>{{:: ts('Default Value:') }}</strong></a>
+          </li>
           <li ng-repeat="opt in $ctrl.getOptions()" >
             <a href ng-click="toggleDefaultValueItem(opt.id); $event.stopPropagation(); $event.target.blur();">
               <i class="crm-i fa-{{defaultValueContains(opt.id) ? 'check-' : ''}}circle-o"></i>
-- 
2.25.1