[jtrac-svn] SF.net SVN: j-trac:[1426] trunk/jtrac/src/main/java/info/jtrac/wicket

[<udi...@us...>]

Revision: 1426
          http://sourceforge.net/p/j-trac/code/1426
Author:   udittmer
Date:     2022-01-12 17:01:00 +0000 (Wed, 12 Jan 2022)
Log Message:
-----------
apply markdown to item details on search results page

Modified Paths:
--------------
    trunk/jtrac/src/main/java/info/jtrac/wicket/BasePanel.java
    trunk/jtrac/src/main/java/info/jtrac/wicket/ItemListPanel.java
    trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPanel.java

Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/BasePanel.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/BasePanel.java	2021-12-14 15:29:09 UTC (rev 1425)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/BasePanel.java	2022-01-12 17:01:00 UTC (rev 1426)
@@ -64,5 +64,10 @@
         StringResourceModel m = new StringResourceModel(key, null, null, params);
         m.setLocalizer(getLocalizer());
         return m.getString();
-    }            
+    }
+
+	protected boolean renderMarkdown() {
+		String markdown = JtracApplication.get().getJtrac().loadConfig("markdown.enabled");
+		return markdown != null && markdown.equalsIgnoreCase("true");
+	}
 }

Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/ItemListPanel.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/ItemListPanel.java	2021-12-14 15:29:09 UTC (rev 1425)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/ItemListPanel.java	2022-01-12 17:01:00 UTC (rev 1426)
@@ -268,6 +268,7 @@
                     protected void populateItem(ListItem listItem) {
                         ColumnHeading ch = (ColumnHeading) listItem.getModelObject();
                         IModel value = null;
+						boolean dontEscape = false;
                         if(ch.isField()) {
                             value = new Model(item.getCustomValue(ch.getField().getName()));
                         } else {
@@ -310,6 +311,10 @@
                                         listItem.add(detailFrag);
                                         return;
                                     } else {                                    
+										if (renderMarkdown()) {
+											item.setDetail(ItemUtils.renderMarkdown(item.getDetail()));
+											dontEscape = true;
+										}
                                         value = new PropertyModel(item, "detail");                                    
                                     } 
                                     break;
@@ -349,6 +354,8 @@
                         }
                         Label label = new Label("column", value);
                         label.setRenderBodyOnly(true);
+						if (dontEscape)
+							label.setEscapeModelStrings(false);
                         listItem.add(label);
                     }
                 };

Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPanel.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPanel.java	2021-12-14 15:29:09 UTC (rev 1425)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPanel.java	2022-01-12 17:01:00 UTC (rev 1426)
@@ -73,11 +73,6 @@
         addComponents(item);
     }
 
-	protected boolean renderMarkdown() {
-		String markdown = JtracApplication.get().getJtrac().loadConfig("markdown.enabled");
-		return markdown != null && markdown.equalsIgnoreCase("true");
-	}
-
     /**
      * This method allows to add components (items).
      * 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.