planner r895 - in trunk: . data/stylesheets

[mvdpot svn gnome org]

Author: mvdpot
Date: Sat Mar 15 14:44:01 2008
New Revision: 895
URL: http://svn.gnome.org/viewvc/planner?rev=895&view=rev

Log:
2008-03-15  Maurice van der Pot  <griffon26 kfk4ever com>

	* data/stylesheets/html1_gantt.xsl:
	Use long resource name in exported HTML if no short resource name is given,
	also for milestone tasks (bug #439180).



Modified:
   trunk/ChangeLog
   trunk/data/stylesheets/html1_gantt.xsl

Modified: trunk/data/stylesheets/html1_gantt.xsl
==============================================================================
--- trunk/data/stylesheets/html1_gantt.xsl	(original)
+++ trunk/data/stylesheets/html1_gantt.xsl	Sat Mar 15 14:44:01 2008
@@ -261,7 +261,16 @@
                     <xsl:for-each select="/project/allocations/allocation[ task-id=$task-id]">
                       <xsl:sort data-type="number" select="@resource-id" order="descending"/>
                       <xsl:variable name="resource-id" select="@resource-id"/>
-                      <xsl:value-of select="/project/resources/resource[ id=$resource-id]/@short-name"/>
+
+                      <xsl:choose>
+                        <xsl:when test="/project/resources/resource[ id=$resource-id]/@short-name = ''">
+                          <xsl:value-of select="/project/resources/resource[ id=$resource-id]/@name"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <xsl:value-of select="/project/resources/resource[ id=$resource-id]/@short-name"/>
+                        </xsl:otherwise>
+                      </xsl:choose>
+
                       <xsl:if test="not(position() = last())">
                         <xsl:text>, </xsl:text>
                       </xsl:if>
@@ -284,6 +293,7 @@
                           <xsl:value-of select="/project/resources/resource[ id=$resource-id]/@short-name"/>
                         </xsl:otherwise>
                       </xsl:choose>
+
                       <xsl:if test="not(position() = last())">
                         <xsl:text>, </xsl:text>
                       </xsl:if>