Fix civicrm#10 add prefix to new afforms to prevent name conflicts

totten · Sep 16, 2020 · 43d8dd7 · 43d8dd7
1 parent 8cc0fa9
commit 43d8dd7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
@@ -16,7 +16,8 @@ protected function writeRecord($item) {
 
     // If no name given, create a unique name based on the title
     if (empty($item['name'])) {
-      $item['name'] = _afform_angular_module_name(\CRM_Utils_String::munge($item['title'], '-'));
+      $prefix = !empty($item['join']) ? "afjoin-{$item['join']}" : !empty($item['block']) ? 'afblock-' . str_replace('*', 'all', $item['block']) : 'afform';
+      $item['name'] = _afform_angular_module_name($prefix . '-' . \CRM_Utils_String::munge($item['title'], '-'));
       $suffix = '';
       while (
         file_exists($scanner->createSiteLocalPath($item['name'] . $suffix, \CRM_Afform_AfformScanner::METADATA_FILE))