j-trac-svn Mailing List for JTrac (Page 5)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1389
          http://sourceforge.net/p/j-trac/code/1389
Author:   udittmer
Date:     2021-09-15 07:13:53 +0000 (Wed, 15 Sep 2021)
Log Message:
-----------
Config UI for auto-linking URLs

Modified Paths:
--------------
    trunk/jtrac/src/main/java/info/jtrac/domain/Config.java
    trunk/jtrac/src/main/java/info/jtrac/wicket/BasePanel.java
    trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPanel.java
    trunk/jtrac/src/main/resources/messages_de.properties
    trunk/jtrac/src/main/resources/messages_en.properties

Modified: trunk/jtrac/src/main/java/info/jtrac/domain/Config.java
===================================================================

--- trunk/jtrac/src/main/java/info/jtrac/domain/Config.java	2021-09-14 18:48:22 UTC (rev 1388)
+++ trunk/jtrac/src/main/java/info/jtrac/domain/Config.java	2021-09-15 07:13:53 UTC (rev 1389)
@@ -58,6 +58,7 @@
         PARAMS.add("attachment.maxsize");
         PARAMS.add("pwd.minLength");
         PARAMS.add("time.pretty");
+        PARAMS.add("urls.autolink");
     }
 
     public static Set<String> getParams() {

Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/BasePanel.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/BasePanel.java	2021-09-14 18:48:22 UTC (rev 1388)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/BasePanel.java	2021-09-15 07:13:53 UTC (rev 1389)
@@ -1,66 +1,77 @@
-/*
- * Copyright 2002-2005 the original author or authors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package info.jtrac.wicket;
-
-import info.jtrac.Jtrac;
-import info.jtrac.domain.Space;
-import info.jtrac.domain.User;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.StringResourceModel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * base class for all wicket panels, this provides
- * a way to access the spring managed service layer
- * as well as other convenience common methods
- */
-public class BasePanel extends Panel {
-    
-    protected static final Logger logger = LoggerFactory.getLogger(BasePanel.class);
-    
-    protected Jtrac getJtrac() {
-        return JtracApplication.get().getJtrac();
-    }          
-    
-    protected User getPrincipal() {
-        return JtracSession.get().getUser();
-    }
-    
-    protected void setCurrentSpace(Space space) {
-        JtracSession.get().setCurrentSpace(space);
-    }      
-    
-    protected Space getCurrentSpace() {
-        return JtracSession.get().getCurrentSpace();
-    }               
-    
-    protected String localize(String key) {
-        return getLocalizer().getString(key, null);
-    }
-    
-    protected String localize(String key, Object... params) {
-        StringResourceModel m = new StringResourceModel(key, null, null, params);
-        m.setLocalizer(getLocalizer());
-        return m.getString();
-    }            
-    
-    public BasePanel(String id) {
-        super(id);
-    }       
-    
-}
+/*
+ * Copyright 2002-2005 the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package info.jtrac.wicket;
+
+import info.jtrac.Jtrac;
+import info.jtrac.domain.Space;
+import info.jtrac.domain.User;
+
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.StringResourceModel;
+
+import org.springframework.util.StringUtils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * base class for all wicket panels, this provides a way to access the
+ * Spring managed service layer as well as other convenience common methods
+ */
+public class BasePanel extends Panel {
+
+    protected static final Logger logger = LoggerFactory.getLogger(BasePanel.class);
+    
+    public BasePanel(String id) {
+        super(id);
+    }       
+
+    protected Jtrac getJtrac() {
+        return JtracApplication.get().getJtrac();
+    }          
+    
+    protected User getPrincipal() {
+        return JtracSession.get().getUser();
+    }
+    
+    protected void setCurrentSpace(Space space) {
+        JtracSession.get().setCurrentSpace(space);
+    }      
+    
+    protected Space getCurrentSpace() {
+        return JtracSession.get().getCurrentSpace();
+    }               
+    
+    protected String localize(String key) {
+        return getLocalizer().getString(key, null);
+    }
+    
+    protected String localize(String key, Object... params) {
+        StringResourceModel m = new StringResourceModel(key, null, null, params);
+        m.setLocalizer(getLocalizer());
+        return m.getString();
+    }            
+
+	protected boolean autoLinkUrls() { 
+		String autoLink = getJtrac().loadConfig("urls.autolink");
+		if (StringUtils.hasText(autoLink)) {
+			return autoLink.trim().equalsIgnoreCase("true");
+		} else {
+			return false;
+		}
+	}
+}

Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPanel.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPanel.java	2021-09-14 18:48:22 UTC (rev 1388)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/ItemViewPanel.java	2021-09-15 07:13:53 UTC (rev 1389)
@@ -77,6 +77,7 @@
      * @param item The {@link Item} to add.
      */
     private void addComponents(final Item item) {
+
         add(new Label("refId", new PropertyModel(item, "refId")));
         
         add(new Link("relate") {
@@ -186,7 +187,11 @@
         add(new Label("loggedBy", new PropertyModel(item, "loggedBy.name")));
         add(new Label("assignedTo", new PropertyModel(item, "assignedTo.name")));
         add(new Label("summary", new PropertyModel(item, "summary")));
-        add(new Label("detail", ItemUtils.htmlizeUrls(ItemUtils.fixWhiteSpace(item.getDetail()))).setEscapeModelStrings(false));
+        String text = ItemUtils.fixWhiteSpace(item.getDetail());
+		if (autoLinkUrls()) {
+			text = ItemUtils.htmlizeUrls(text);
+		}
+        add(new Label("detail", text).setEscapeModelStrings(false));
 
         final SimpleAttributeModifier sam = new SimpleAttributeModifier("class", "alt");
         final Map<Field.Name, Field> fields = item.getSpace().getMetadata().getFields();
@@ -236,7 +241,11 @@
                     
                     WebMarkupContainer comment = new WebMarkupContainer("comment");
                     comment.add(new AttachmentLinkPanel("attachment", h.getAttachment()));
-                    comment.add(new Label("comment", ItemUtils.htmlizeUrls(ItemUtils.fixWhiteSpace(h.getComment()))).setEscapeModelStrings(false));
+					String text = ItemUtils.fixWhiteSpace(h.getComment());
+					if (autoLinkUrls()) {
+						text = ItemUtils.htmlizeUrls(text);
+					}
+                    comment.add(new Label("comment", text).setEscapeModelStrings(false));
                     listItem.add(comment);
                     
                     listItem.add(new Label("timeStamp", DateUtils.formatTimeStamp(h.getTimeStamp())));

Modified: trunk/jtrac/src/main/resources/messages_de.properties
===================================================================
--- trunk/jtrac/src/main/resources/messages_de.properties	2021-09-14 18:48:22 UTC (rev 1388)
+++ trunk/jtrac/src/main/resources/messages_de.properties	2021-09-15 07:13:53 UTC (rev 1389)
@@ -204,6 +204,7 @@
 config.attachment.maxsize = Maximalgr\u00F6\u00DFe f\u00FCr Anlagen in MB, "-1" f\u00FCr Kein-Limit (Default 5)
 config.pwd.minLength = Minimale L\u00e4nge von Passw\u00f6rtern (Default 8)
 config.time.pretty = Relative Zeiten anzeigen wie auf Github, Twitter und Facebook (auf true setzen, Default ist false)
+config.urls.autolink = URLs in Tickets und Kommentaren automatisch verlinken
 
 # config_list (config_form does not have any extra messages)
 config_list.configurationSettings = Einstellungen

Modified: trunk/jtrac/src/main/resources/messages_en.properties
===================================================================
--- trunk/jtrac/src/main/resources/messages_en.properties	2021-09-14 18:48:22 UTC (rev 1388)
+++ trunk/jtrac/src/main/resources/messages_en.properties	2021-09-15 07:13:53 UTC (rev 1389)
@@ -204,6 +204,7 @@
 config.attachment.maxsize = Maximum size in MB of file-attachments. (default 5 MB) Use -1 for no-limit
 config.pwd.minLength = Minimal length of passwords (default is 8)
 config.time.pretty = Show relative timestamps as on Github, Twitter and Facebook (set to true, default is false)
+config.urls.autolink = Auto-link URLs in tickets and comments 
 
 # config_list (config_form does not have any extra messages)
 config_list.configurationSettings = Configuration Settings

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





2009	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (20)
2010	Jan	Feb	Mar	Apr (1)	May (3)	Jun (1)	Jul (1)	Aug (3)	Sep (6)	Oct (1)	Nov	Dec (4)
2011	Jan	Feb	Mar	Apr (1)	May (1)	Jun	Jul	Aug	Sep (2)	Oct (4)	Nov	Dec
2021	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (14)	Sep (9)	Oct (9)	Nov (15)	Dec (5)
2022	Jan (3)	Feb (13)	Mar (2)	Apr	May (3)	Jun (4)	Jul (4)	Aug (1)	Sep	Oct	Nov (7)	Dec (3)
2023	Jan (1)	Feb (3)	Mar (1)	Apr (4)	May (1)	Jun (5)	Jul (3)	Aug	Sep	Oct (1)	Nov	Dec
2024	Jan (1)	Feb	Mar (1)	Apr	May	Jun (3)	Jul	Aug	Sep	Oct	Nov	Dec

j-trac-svn Mailing List for JTrac (Page 5)

Easy to set up bug tracking with Java

j-trac-svn — JTrac SVN commit notifications