From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 28 Dec 2019 01:23:30 +0000 (-0500)
Subject: Fix #10 add prefix to new afforms to prevent name conflicts
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=43d8dd79ecd345e06bf5975ffc66de6958f08296;p=civicrm-core.git

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

diff --git a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
index 8581583e34..48e21b27f1 100644
--- a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
+++ b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php
@@ -16,7 +16,8 @@ trait AfformSaveTrait {
 
     // 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))