dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6327
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-03-21 10:12:51 +0100
message:
  fixed problem rendering of api pages
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueSetController.java
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataValueSets.xsl
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/list.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-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueSetController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueSetController.java	2012-03-19 19:35:52 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueSetController.java	2012-03-21 09:12:51 +0000
@@ -58,7 +58,10 @@
     @RequestMapping( method = RequestMethod.GET )
     public String getDataValueSet( Model model ) throws Exception
     {
-        model.addAttribute( "model", new DataValueSets() );
+        DataValueSets dataValueSets = new DataValueSets();
+        dataValueSets.getDataValueSets().add( new DataValueSet() );
+
+        model.addAttribute( "model", dataValueSets );
 
         return "dataValueSets";
     }

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataValueSets.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataValueSets.xsl	2012-03-20 14:42:30 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/dataValueSets.xsl	2012-03-21 09:12:51 +0000
@@ -4,7 +4,7 @@
                 xmlns:d="http://dhis2.org/schema/dxf/2.0";
     >
 
-<xsl:template match="d:dxf2">
+<xsl:template match="d:dxf2/d:dataValueSets">
 
 <p>The DataValueSet resource provides a way to POST data values into DHIS 2.</p>
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/list.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/list.xsl	2012-03-16 10:07:49 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/list.xsl	2012-03-21 09:12:51 +0000
@@ -12,8 +12,7 @@
     d:organisationUnits|d:dataElementGroups|d:dataElementGroupSets|d:dataSets|
     d:documents|d:indicatorGroups|d:indicatorGroupSets|d:organisationUnitGroups|
     d:organisationUnitGroupSets|d:indicatorTypes|d:attributeTypes|d:reports|d:constants|
-    d:sqlViews|d:validationRules|d:validationRuleGroups|d:users|d:userGroups|d:reportTables|
-    d:dataValueSets">
+    d:sqlViews|d:validationRules|d:validationRuleGroups|d:users|d:userGroups|d:reportTables">
 
     <xsl:choose>
       <xsl:when test="@page">