diff --git a/public/legacy/modules/DynamicFields/language/en_us.lang.php b/public/legacy/modules/DynamicFields/language/en_us.lang.php index 80e60f832a..a3314a44bd 100755 --- a/public/legacy/modules/DynamicFields/language/en_us.lang.php +++ b/public/legacy/modules/DynamicFields/language/en_us.lang.php @@ -90,6 +90,7 @@ 'ERR_RESERVED_FIELD_NAME' => "Reserved Keyword", 'ERR_SELECT_FIELD_TYPE' => 'Please Select a Field Type', 'ERR_FIELD_NAME_ALREADY_EXISTS' => 'Field Name already exists', + 'ERR_LABEL_NAME_ALREADY_EXISTS' => 'Label already exists', 'LBL_BTN_ADD' => 'Add', 'LBL_BTN_EDIT' => 'Edit', 'LBL_GENERATE_URL' => 'Generate URL', diff --git a/public/legacy/modules/DynamicFields/templates/Fields/Forms/coreTop.tpl b/public/legacy/modules/DynamicFields/templates/Fields/Forms/coreTop.tpl index 48bc7b1627..f64960a393 100755 --- a/public/legacy/modules/DynamicFields/templates/Fields/Forms/coreTop.tpl +++ b/public/legacy/modules/DynamicFields/templates/Fields/Forms/coreTop.tpl @@ -67,6 +67,7 @@ addToValidateIsInArray('popup_form', 'name', 'in_array', true,'{sugar_translate module="DynamicFields" label="ERR_RESERVED_FIELD_NAME"}', '{$field_name_exceptions}', 'u=='); {if $hideLevel == 0} addToValidateIsInArray('popup_form', 'name', 'in_array', true, '{sugar_translate module="DynamicFields" label="ERR_FIELD_NAME_ALREADY_EXISTS"}', '{$existing_field_names}', 'u=='); + addToValidateIsInArray('popup_form', 'label_key_id', 'in_array', true, '{sugar_translate module="DynamicFields" label="ERR_LABEL_NAME_ALREADY_EXISTS"}', '{$existing_label_names}', 'u=='); {/if} diff --git a/public/legacy/modules/ModuleBuilder/views/view.modulefield.php b/public/legacy/modules/ModuleBuilder/views/view.modulefield.php index 45f8f25a64..2cc6e15332 100755 --- a/public/legacy/modules/ModuleBuilder/views/view.modulefield.php +++ b/public/legacy/modules/ModuleBuilder/views/view.modulefield.php @@ -325,7 +325,8 @@ public function fetch( $fv->ss->assign('duplicate_merge_options', $GLOBALS['app_list_strings']['custom_fields_merge_dup_dom'] ?? []); $triggers = array() ; - $existing_field_names = array() ; + $existing_field_names = array(); + $existing_label_names = array(); foreach ($module->mbvardefs->vardefs['fields'] as $field) { if ($field [ 'type' ] == 'enum' || $field [ 'type'] == 'multienum') { $triggers [] = $field [ 'name' ] ; @@ -336,10 +337,16 @@ public function fetch( $existing_field_names [] = strtoupper($matches[1]); } } + + if(!empty($field['vname'])) + { + $existing_label_names[] = $field['vname']; + } } $fv->ss->assign('triggers', $triggers); $fv->ss->assign('existing_field_names', $json->encode($existing_field_names)); + $fv->ss->assign('existing_label_names', $json->encode($existing_label_names)); $fv->ss->assign('mod_strings', $GLOBALS['mod_strings']); // jchi #24880