From ca9834204be5f9cfc0e29715f44c9aa386a60729 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Thu, 13 Apr 2023 11:50:47 -0500 Subject: [PATCH] Split fieldNameToLabel out into a method --- .../core/instances/QInstanceEnricher.java | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QInstanceEnricher.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QInstanceEnricher.java index 23224694..8746b4a1 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QInstanceEnricher.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QInstanceEnricher.java @@ -332,14 +332,7 @@ public class QInstanceEnricher { if(!StringUtils.hasContent(field.getLabel())) { - if(configRemoveIdFromNameWhenCreatingPossibleValueFieldLabels && StringUtils.hasContent(field.getPossibleValueSourceName()) && field.getName() != null && field.getName().endsWith("Id")) - { - field.setLabel(nameToLabel(field.getName().substring(0, field.getName().length() - 2))); - } - else - { - field.setLabel(nameToLabel(field.getName())); - } + fieldNameToLabel(field); } ////////////////////////////////////////////////////////////////////////// @@ -381,6 +374,23 @@ public class QInstanceEnricher + /******************************************************************************* + ** + *******************************************************************************/ + public void fieldNameToLabel(QFieldMetaData field) + { + if(configRemoveIdFromNameWhenCreatingPossibleValueFieldLabels && StringUtils.hasContent(field.getPossibleValueSourceName()) && field.getName() != null && field.getName().endsWith("Id")) + { + field.setLabel(nameToLabel(field.getName().substring(0, field.getName().length() - 2))); + } + else + { + field.setLabel(nameToLabel(field.getName())); + } + } + + + /******************************************************************************* ** *******************************************************************************/