From 949a19d5cf41918132b3b0c182f6e307a4a709a2 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Fri, 27 Dec 2019 20:23:30 -0500 Subject: [PATCH] Fix #10 add prefix to new afforms to prevent name conflicts --- ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php b/ext/afform/core/Civi/Api4/Utils/AfformSaveTrait.php index 8581583e34fc..48e21b27f1cb 100644 --- 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))