1 files changed, 15 insertions, 3 deletions

diff --git a/buildhelpers/src/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java b/buildhelpers/src/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java
index 4ca17443dc..6434c94352 100644
--- a/buildhelpers/src/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java
+++ b/buildhelpers/src/com/vaadin/buildhelpers/FetchReleaseNotesTickets.java
@@ -24,8 +24,12 @@ import java.util.List;
 import org.apache.commons.io.IOUtils;
 
 public class FetchReleaseNotesTickets {
-    private static final String queryURL = "http://dev.vaadin.com/query?status=closed&milestone=Vaadin+@version@&resolution=fixed&format=tab&order=id";
-    private static final String ticketTemplate = "  <li><a href=\"http://dev.vaadin.com/ticket/@ticket@\">#@ticket@</a>: @description@</li>";
+    private static final String queryURL = "http://dev.vaadin.com/query?status=closed&amp;milestone=Vaadin+@version@&amp;resolution=fixed&amp;col=id&amp;col=summary&amp;col=owner&amp;col=type&amp;col=priority&amp;col=component&amp;col=version&amp;col=bfptime&col=fv&amp;format=tab&amp;order=id";
+    private static final String ticketTemplate = "<tr>"
+            + "@badge@" //
+            + "<td class=\"ticket\"><a href=\"http://dev.vaadin.com/ticket/@ticket@\">#@ticket@</a></td>" //
+            + "<td>@description@</td>" //
+            + "</tr>"; //
 
     public static void main(String[] args) throws IOException {
         String version = System.getProperty("vaadin.version");
@@ -52,8 +56,16 @@ public class FetchReleaseNotesTickets {
                 summary = summary.substring(1, summary.length() - 1);
                 summary = summary.replace("\"\"", "\"");
             }
+            String badge = "<td></td>";
+            if (fields.length >= 8 && !fields[7].equals("")) {
+                badge = "<td class=\"bfp\"><span class=\"bfp\">Priority</span></td>";
+            } else if (fields.length >= 9 && fields[8].equalsIgnoreCase("true")) {
+                badge = "<td class=\"fv\"><span class=\"fv\">Vote</span></td>";
+            }
+
             System.out.println(ticketTemplate.replace("@ticket@", fields[0])
-                    .replace("@description@", summary));
+                    .replace("@description@", summary)
+                    .replace("@badge@", badge));
         }
         urlStream.close();
     }