maybe3

colemanw · Feb 19, 2025 · 1193d4a · 1193d4a
1 parent 14bb303
commit 1193d4a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -98,7 +98,7 @@ jobs:
           cd ~/drupal
           COMPOSER_MEMORY_LIMIT=-1 composer require civicrm/civicrm-asset-plugin:'~1.1' civicrm/civicrm-{core,packages,drupal-8}:${{ matrix.civicrm }} -W
           cd vendor/civicrm/civicrm-core
-          git apply -vvv $GITHUB_WORKSPACE/patch.patch
+          # git apply -vvv $GITHUB_WORKSPACE/patch.patch
       - name: Download Webform
         run: |
           cd ~/drupal

diff --git a/src/AdminForm.php b/src/AdminForm.php
@@ -2305,7 +2305,15 @@ public static function insertComponent(&$field, &$enabled, $settings, $create_fi
     if ($field['type'] === 'select') {
       //To-do: Make this as a default type in src/Fields.php.
       $field['type'] = 'civicrm_options';
-      if ($options = $utils->wf_crm_field_options($field, 'component_insert', $settings['data'])) {
+      //To-do: When it's a dynamic list this doesn't seem to have any effect anyway
+      $options = NULL;
+      try {
+        $options = $utils->wf_crm_field_options($field, 'component_insert', $settings['data']);
+      }
+      catch (\CRM_Core_Exception $cce) {
+        // whatever
+      }
+      if ($options) {
         $field['options'] = $options;
         $field['extra']['items'] = $utils->wf_crm_array2str($options);
         $field['extra']['aslist'] = $field['extra']['aslist'] ?? FALSE;