dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #15242
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5431: Quickly fixed
------------------------------------------------------------
revno: 5431
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-12-15 12:53:38 +0100
message:
Quickly fixed
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridHeader.java
dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/grid.xsl
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridHeader.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridHeader.java 2011-12-14 15:07:54 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridHeader.java 2011-12-15 11:53:38 +0000
@@ -1,11 +1,5 @@
package org.hisp.dhis.common;
-import org.codehaus.jackson.annotate.JsonProperty;
-
-import javax.xml.bind.annotation.*;
-import java.util.Arrays;
-import java.util.List;
-
/*
* Copyright (c) 2004-2010, University of Oslo
* All rights reserved.
@@ -33,6 +27,12 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import javax.xml.bind.annotation.*;
+import java.util.Arrays;
+import java.util.List;
+
/**
* @author Lars Helge Overland
*/
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/grid.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/grid.xsl 2011-12-15 11:39:20 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/grid.xsl 2011-12-15 11:53:38 +0000
@@ -5,7 +5,7 @@
>
<xsl:template match="d:header">
- <th> <xsl:value-of select="d:column"/> </th>
+ <th> <xsl:value-of select="@d:name"/> </th>
</xsl:template>
<xsl:template match="d:rows">