dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5524
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-12-21 14:29:45 +0100
message:
  disabled pdf for webapi (for now, will re-enable in 2.7)
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Resources.java
  dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml
  dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/identifiable-row.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/webdomain/Resources.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Resources.java	2011-12-21 11:37:17 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/webdomain/Resources.java	2011-12-21 13:29:45 +0000
@@ -105,7 +105,7 @@
 
         MediaType[] defaultMediaTypes = new MediaType[]{
             MediaType.TEXT_HTML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON,
-            new MediaType( "application", "javascript" ), new MediaType( "application", "pdf" )
+            new MediaType( "application", "javascript" ) /* , new MediaType( "application", "pdf" ) */
         };
 
         List<RequestMethod> requestMethods = Arrays.asList( defaultRequestMethods );

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml	2011-12-16 17:42:41 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/META-INF/dhis/servlet.xml	2011-12-21 13:29:45 +0000
@@ -22,7 +22,7 @@
         <entry key="json" value="application/json" />
         <entry key="jsonp" value="application/javascript" />
         <entry key="xml" value="application/xml" />
-        <entry key="pdf" value="application/pdf" />
+        <!--<entry key="pdf" value="application/pdf" />-->
         <entry key="html" value="text/html" />
         <entry key="png" value="image/png" />
       </map>
@@ -48,11 +48,13 @@
           <property name="viewClass" value="org.hisp.dhis.api.view.XsltHtmlView" />
         </bean>
 
+<!--
         <bean name="xslFoPdfViewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
           <property name="prefix" value="/templates/pdf/" />
           <property name="suffix" value=".xsl" />
           <property name="viewClass" value="org.hisp.dhis.api.view.XslFoPdfView" />
         </bean>
+-->
       </list>
     </property>
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/identifiable-row.xsl'
--- dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/identifiable-row.xsl	2011-12-15 16:24:21 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/resources/templates/html/identifiable-row.xsl	2011-12-21 13:29:45 +0000
@@ -9,7 +9,7 @@
       <td> <a href="{@link}.xml">xml</a> </td>
       <td> <a href="{@link}.json">json</a> </td>
       <td> <a href="{@link}.jsonp">jsonp</a> </td>
-      <td> <a href="{@link}.pdf">pdf</a> </td>
+      <!--<td> <a href="{@link}.pdf">pdf</a> </td>-->
     </tr>
   </xsl:template>