MID-7461 Change of info text of search fields

Evolveum · May 3, 2022 · 6b7d547 · 6b7d547
1 parent ce0e5ac
commit 6b7d547
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/component/search/AbstractSearchItemPanel.java b/...rc/main/java/com/evolveum/midpoint/gui/impl/component/search/AbstractSearchItemPanel.java
@@ -77,7 +77,7 @@ protected void initLayout() {
 
         Label help = new Label(ID_HELP);
         IModel<String> helpModel = createHelpModel();
-        help.add(AttributeModifier.replace("title",createStringResource(helpModel.getObject() != null ? helpModel.getObject() : "")));
+        help.add(AttributeModifier.replace("title", createStringResource(helpModel.getObject() != null ? helpModel.getObject() : "")));
         help.add(new InfoTooltipBehavior(){
             @Override
             public String getDataPlacement() {

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchFactory.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchFactory.java
@@ -8,11 +8,15 @@
 
 import java.lang.reflect.Modifier;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.gui.api.util.WebPrismUtil;
 import com.evolveum.midpoint.prism.path.ItemName;
 
+import com.evolveum.midpoint.prism.util.PrismUtil;
 import com.evolveum.midpoint.web.component.search.*;
 
 import org.apache.commons.collections4.CollectionUtils;
@@ -449,7 +453,13 @@ public static  <C extends Containerable> PropertySearchItemWrapper createPropert
         itemWrapper.setVisible(isFixedItem(type, path));
         itemWrapper.setValueTypeName(itemDef.getTypeName());
         itemWrapper.setName(WebComponentUtil.getItemDefinitionDisplayNameOrName(itemDef, null));
-        itemWrapper.setHelp(itemDef.getHelp());
+        String help = WebPrismUtil.getHelpText(itemDef);
+        if (StringUtils.isNotBlank(help)) {
+            Pattern pattern = Pattern.compile("<.+?>");
+            Matcher m = pattern.matcher(help);
+            help = m.replaceAll("");
+        }
+        itemWrapper.setHelp(help);
         return itemWrapper;
     }