From 83412ba5fdf9fca0c50ee0ec88d3b903305ec26c Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 2 Jul 2021 20:43:03 -0400
Subject: [PATCH] Afform - minor fixes

---
 ext/afform/admin/ang/afGuiEditor.css              | 6 ++++--
 ext/afform/admin/ang/afGuiEditor/afGuiSearch.html | 2 +-
 ext/afform/core/Civi/Api4/Action/Afform/Get.php   | 7 +++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ext/afform/admin/ang/afGuiEditor.css b/ext/afform/admin/ang/afGuiEditor.css
index a36906c024..7e5c2f219e 100644
--- a/ext/afform/admin/ang/afGuiEditor.css
+++ b/ext/afform/admin/ang/afGuiEditor.css
@@ -268,7 +268,7 @@ body.af-gui-dragging {
   color: #0071bd;
 }
 
-#afGuiEditor [ui-sortable] {
+#afGuiEditor-canvas [ui-sortable] {
   min-height: 60px;
   margin-top: 10px;
 }
@@ -291,7 +291,9 @@ body.af-gui-dragging {
   max-height: 400px;
   overflow-y: auto;
 }
-
+#afGuiEditor .af-gui-entity-palette-select-list label {
+  margin-top: 10px;
+}
 #afGuiEditor .af-gui-entity-palette-select-list [ui-sortable] > div {
   cursor: move;
   padding-left: 10px;
diff --git a/ext/afform/admin/ang/afGuiEditor/afGuiSearch.html b/ext/afform/admin/ang/afGuiEditor/afGuiSearch.html
index 17a131afcf..63f107c803 100644
--- a/ext/afform/admin/ang/afGuiEditor/afGuiSearch.html
+++ b/ext/afform/admin/ang/afGuiEditor/afGuiSearch.html
@@ -25,7 +25,7 @@
         <label>{{:: ts('Calculated Fields') }}</label>
         <div ui-sortable="$ctrl.editor.getSortableOptions()" ui-sortable-update="buildPaletteLists" ng-model="calcFieldList">
           <div ng-repeat="field in calcFieldList" ng-class="{disabled: fieldInUse(field.name)}">
-            <div class="af-gui-palette-item">{{:: field.defn.label }}></div>
+            <div class="af-gui-palette-item">{{:: field.defn.label }}</div>
           </div>
         </div>
       </div>
diff --git a/ext/afform/core/Civi/Api4/Action/Afform/Get.php b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
index 8e32e56fe0..277eaa1974 100644
--- a/ext/afform/core/Civi/Api4/Action/Afform/Get.php
+++ b/ext/afform/core/Civi/Api4/Action/Afform/Get.php
@@ -103,16 +103,15 @@ class Get extends \Civi\Api4\Generic\BasicGetAction {
     }
     $customApi = CustomGroup::get()
       ->setCheckPermissions(FALSE)
-      ->setSelect(['name', 'title', 'help_pre', 'help_post', 'extends', 'max_multiple'])
+      ->addSelect('name', 'title', 'help_pre', 'help_post', 'extends', 'max_multiple')
       ->addWhere('is_multiple', '=', 1)
       ->addWhere('is_active', '=', 1);
     if ($groupNames) {
       $customApi->addWhere('name', 'IN', $groupNames);
     }
     if ($getLayout) {
-      $customApi->addSelect('help_pre')->addSelect('help_post');
-      $customApi->addChain('fields', CustomField::get()
-        ->setCheckPermissions(FALSE)
+      $customApi->addSelect('help_pre', 'help_post');
+      $customApi->addChain('fields', CustomField::get(FALSE)
         ->addSelect('name')
         ->addWhere('custom_group_id', '=', '$id')
         ->addWhere('is_active', '=', 1)
-- 
2.25.1