Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r997 - in trunk/jira-extensions: changelog-report/src/etc changelog-report/src/etc/templates/changelog-report changelog-report/src/java/pl/net/mamut/jira jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator releasenotes-affect-report/src/java/pl/net/mamut/jira releasenotes-report/src/java/pl/net/mamut roadmap-report/src/etc roadmap-report/src/etc/templates/roadmap-report roadmap-report/src/java/pl/net/mamut/jira
Author: adamw
Date: 2005-08-27 16:07:47 -0400 (Sat, 27 Aug 2005)
New Revision: 997
Modified:
trunk/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml
trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm
trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm
trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java
trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp
trunk/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java
trunk/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java
trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml
trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm
trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm
trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java
Log:
Some fixes
Modified: trunk/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml
===================================================================
--- trunk/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml 2005-08-27 18:51:55 UTC (rev 996)
+++ trunk/jira-extensions/changelog-report/src/etc/atlassian-plugin.xml 2005-08-27 20:07:47 UTC (rev 997)
@@ -69,6 +69,10 @@
<description>report.changelog.style.description</description>
<type>select</type>
<values>
+ <value>
+ <key>none</key>
+ <value>None</value>
+ </value>
<value>
<key>html</key>
<value>HTML</value>
Modified: trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm
===================================================================
--- trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm 2005-08-27 18:51:55 UTC (rev 996)
+++ trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-html.vm 2005-08-27 20:07:47 UTC (rev 997)
@@ -30,7 +30,7 @@
<td width="15%">
<b>$constantsManager.getStatus($issue.getString('status')).getString("name")</b> </td><br />
<td>
- $issue.getString('summary') </td><br />
+ $textUtils.htmlEncode($issue.getString('summary')) </td><br />
<td width="15%" align="right">
($constantsManager.getPriority($issue.getString('priority')).getString("name")) </td><br />
</tr> <br />
Modified: trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm
===================================================================
--- trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm 2005-08-27 18:51:55 UTC (rev 996)
+++ trunk/jira-extensions/changelog-report/src/etc/templates/changelog-report/changelog-report-text.vm 2005-08-27 20:07:47 UTC (rev 997)
@@ -18,7 +18,7 @@
#if ($issues.size() > 0)
#foreach ($issue in $issues)
*
- [ $issue.getString('key') ] $issue.getString('summary')
+ [ $issue.getString('key') ] $textUtils.htmlEncode($issue.getString('summary'))
($constantsManager.getStatus($issue.getString('status')).getString("name"),
$constantsManager.getPriority($issue.getString('priority')).getString("name"))
<br />
Modified: trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java
===================================================================
--- trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-27 18:51:55 UTC (rev 996)
+++ trunk/jira-extensions/changelog-report/src/java/pl/net/mamut/jira/ChangelogGlobalReport.java 2005-08-27 20:07:47 UTC (rev 997)
@@ -29,6 +29,7 @@
import com.atlassian.jira.web.util.OutlookDate;
import com.atlassian.jira.web.util.OutlookDateManager;
import com.opensymphony.user.User;
+import com.opensymphony.util.TextUtils;
import java.sql.Timestamp;
import java.text.DateFormat;
@@ -277,9 +278,14 @@
velocityParams.put("dateFormat", dateFormat);
velocityParams.put("constantsManager", constantsManager);
velocityParams.put("appProps", appProps);
+ velocityParams.put("textUtils", new TextUtils());
/* Generating reeport source in the format demanded by the user */
- velocityParams.put("generated", descriptor.getHtml((String)params.get("style"), velocityParams));
+ String style = (String)params.get("style");
+ if ("none".equals(style))
+ velocityParams.put("generated", "");
+ else
+ velocityParams.put("generated", descriptor.getHtml((String)params.get("style"), velocityParams));
return descriptor.getHtml("view", velocityParams);
}
Modified: trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp
===================================================================
--- trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp 2005-08-27 18:51:55 UTC (rev 996)
+++ trunk/jira-extensions/jira-file-modifications/jira-3.3/edit-webapp/secure/views/navigator/rnotes.jsp 2005-08-27 20:07:47 UTC (rev 997)
@@ -90,7 +90,8 @@
List allIssueTypes = constantsManager.getAllIssueTypes();
for (iter = allIssueTypes.iterator(); iter.hasNext();) {
GenericValue issueType = (GenericValue)iter.next();
- issuesNamesMap.put(issueType.getString("id"), issueType.getString("name"));
+ if (!("Sub-task".equals(issueType.getString("name"))))
+ issuesNamesMap.put(issueType.getString("id"), issueType.getString("name"));
}
/* Preparing issueMap */
@@ -107,7 +108,8 @@
/* Filling sets in issueMap */
for (iter = issues.iterator(); iter.hasNext();) {
Issue issue = (Issue) iter.next();
- ((Set)issuesMap.get(issue.getIssueType().getString("id"))).add(issue);
+ Set toAdd = (Set)issuesMap.get(issue.getIssueType().getString("id"));
+ if (toAdd != null) toAdd.add(issue);
}
for (iter = issuesMap.keySet().iterator(); iter.hasNext();) {
Modified: trunk/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java
===================================================================
--- trunk/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java 2005-08-27 18:51:55 UTC (rev 996)
+++ trunk/jira-extensions/releasenotes-affect-report/src/java/pl/net/mamut/jira/ReleaseNotesAffectReport.java 2005-08-27 20:07:47 UTC (rev 997)
@@ -191,12 +191,24 @@
Iterator iter;
/* Map: issue type id -> (Set of issue) */
- Map issuesMap = new TreeMap();
+ Map issuesMap = new TreeMap(new Comparator() {
+ // Sorting issue types by the "sequence" field.
+ public int compare(Object arg0, Object arg1) {
+ String id1 = (String) arg0;
+ String id2 = (String) arg1;
+
+ GenericValue gv1 = constantsManager.getIssueType(id1);
+ GenericValue gv2 = constantsManager.getIssueType(id2);
+
+ return gv1.getLong("sequence").compareTo(
+ gv2.getLong("sequence"));
+ }
+ });
/* Map: issue type id -> issue name */
Map issuesNamesMap = new HashMap();
CustomField affects = customFieldManager.getCustomFieldObjectByName("Affects");
-
+
Map affectsValues = new HashMap();
Iterator it = issues.iterator();
@@ -205,23 +217,26 @@
if (affects != null)
while (it.hasNext()) {
Object key = it.next();
- String issueId = ((GenericValue)key).getString("id");
+ String issueKey = ((GenericValue)key).getString("key");
String str = String.valueOf(affects.getValue(
- issueManager.getIssueObject(issueId)));
+ issueManager.getIssueObject(issueKey)));
if (!(str.equals("null")))
affectsValues.put(key, str.substring(1,str.length() - 1));
}
/* Preparing issueMap */
- for (iter = sections.iterator(); iter.hasNext();)
- issuesMap.put(iter.next(), new TreeSet());
+ for (iter = sections.iterator(); iter.hasNext();) {
+ String typeId = (String) iter.next();
+ issuesMap.put(typeId, new TreeSet());
+ }
+
+ /* Filling sets in issueMap */
+ for (iter = issues.iterator(); iter.hasNext();) {
+ GenericValue issue = (GenericValue) iter.next();
+ Set toAdd = (Set)issuesMap.get(issue.getString("type"));
+ if (toAdd != null) toAdd.add(issue);
+ }
- /* Filling sets in issueMap */
- for (iter = issues.iterator(); iter.hasNext();) {
- GenericValue issue = (GenericValue) iter.next();
- ((Set)issuesMap.get(issue.getString("type"))).add(issue);
- }
-
/* Setting the issues' names */
for (iter = sections.iterator(); iter.hasNext();) {
String issueId = (String)iter.next();
Modified: trunk/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java
===================================================================
--- trunk/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java 2005-08-27 18:51:55 UTC (rev 996)
+++ trunk/jira-extensions/releasenotes-report/src/java/pl/net/mamut/ReleaseNotesReport.java 2005-08-27 20:07:47 UTC (rev 997)
@@ -207,13 +207,16 @@
Map issuesNamesMap = new HashMap();
/* Preparing issueMap */
- for (iter = sections.iterator(); iter.hasNext();)
- issuesMap.put(iter.next(), new TreeSet());
+ for (iter = sections.iterator(); iter.hasNext();) {
+ String typeId = (String) iter.next();
+ issuesMap.put(typeId, new TreeSet());
+ }
/* Filling sets in issueMap */
for (iter = issues.iterator(); iter.hasNext();) {
GenericValue issue = (GenericValue) iter.next();
- ((Set)issuesMap.get(issue.getString("type"))).add(issue);
+ Set toAdd = (Set)issuesMap.get(issue.getString("type"));
+ if (toAdd != null) toAdd.add(issue);
}
/* Setting the issues' names */
Modified: trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml
===================================================================
--- trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml 2005-08-27 18:51:55 UTC (rev 996)
+++ trunk/jira-extensions/roadmap-report/src/etc/atlassian-plugin.xml 2005-08-27 20:07:47 UTC (rev 997)
@@ -86,6 +86,10 @@
<type>select</type>
<values>
<value>
+ <key>none</key>
+ <value>None</value>
+ </value>
+ <value>
<key>html</key>
<value>HTML</value>
</value>
Modified: trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm
===================================================================
--- trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm 2005-08-27 18:51:55 UTC (rev 996)
+++ trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-html.vm 2005-08-27 20:07:47 UTC (rev 997)
@@ -30,7 +30,7 @@
<td width="15%">
<b>$constantsManager.getStatus($issue.getString('status')).getString("name")</b> </td><br />
<td>
- $issue.getString('summary') </td><br />
+ $textUtils.htmlEncode($issue.getString('summary')) </td><br />
<td width="15%" align="right">
($constantsManager.getPriority($issue.getString('priority')).getString("name")) </td><br />
</tr> <br />
Modified: trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm
===================================================================
--- trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm 2005-08-27 18:51:55 UTC (rev 996)
+++ trunk/jira-extensions/roadmap-report/src/etc/templates/roadmap-report/roadmap-report-text.vm 2005-08-27 20:07:47 UTC (rev 997)
@@ -18,7 +18,7 @@
#if ($issues.size() > 0)
#foreach ($issue in $issues)
*
- [ $issue.getString('key') ] $issue.getString('summary')
+ [ $issue.getString('key') ] $textUtils.htmlEncode($issue.getString('summary'))
($constantsManager.getStatus($issue.getString('status')).getString("name"),
$constantsManager.getPriority($issue.getString('priority')).getString("name"))
<br />
Modified: trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java
===================================================================
--- trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java 2005-08-27 18:51:55 UTC (rev 996)
+++ trunk/jira-extensions/roadmap-report/src/java/pl/net/mamut/jira/RoadmapGlobalReport.java 2005-08-27 20:07:47 UTC (rev 997)
@@ -32,6 +32,7 @@
import com.atlassian.jira.web.util.OutlookDateManager;
import com.atlassian.plugin.PluginManager;
import com.opensymphony.user.User;
+import com.opensymphony.util.TextUtils;
import java.sql.Timestamp;
import java.text.DateFormat;
@@ -250,9 +251,14 @@
velocityParams.put("dateFormat", dateFormat);
velocityParams.put("constantsManager", constantsManager);
velocityParams.put("appProps", appProps);
+ velocityParams.put("textUtils", new TextUtils());
/* Generating reeport source in the format demanded by the user */
- velocityParams.put("generated", descriptor.getHtml((String)params.get("style"), velocityParams));
+ String style = (String)params.get("style");
+ if ("none".equals(style))
+ velocityParams.put("generated", "");
+ else
+ velocityParams.put("generated", descriptor.getHtml((String)params.get("style"), velocityParams));
return descriptor.getHtml("view", velocityParams);
}
|
