[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1815: GIS - fixed export image in FF

revision-diff.txt (1.67 KB)

Good work.

···

On Tue, May 4, 2010 at 4:14 PM, noreply@launchpad.net wrote:


revno: 1815

committer: Tran Thanh Tri <Tran Thanh Tri@TranThanhTri-PC>

branch nick: trunk

timestamp: Tue 2010-05-04 12:24:53 +0700

message:

GIS - fixed export image in FF

modified:

dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportImageAction.java

dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml

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-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportImageAction.java’

— dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportImageAction.java 2010-04-27 05:35:16 +0000

+++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/ExportImageAction.java 2010-05-04 05:24:53 +0000

@@ -147,11 +147,10 @@

 protected String execute( HttpServletResponse response, OutputStream out )

     throws Exception

 {
  •    [log.info](http://log.info)( "Exporting image, width: " + width + ", height: " + height + ", format: " + this.format );
    
  •    [log.info](http://log.info)( "Exporting image, width: " + width + ", height: " + height + ", format: " + this.imageFormat );
    
    
    
       if ( imageFormat.equalsIgnoreCase( "image/png" ) )
    
       {
    
         SVGUtils.convertToPNG( getSvg(), out, width, height );

     }

     else

=== modified file ‘dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml’

— dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml 2010-04-06 17:41:30 +0000

+++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml 2010-05-04 05:24:53 +0000

@@ -317,8 +317,7 @@

    <!-- Export Map -->
  •   <bean id="org.hisp.dhis.mapping.action.ExportImageAction" class="org.hisp.dhis.mapping.action.ExportImageAction"
    
  •           scope="prototype">
    
  •   <bean id="org.hisp.dhis.mapping.action.ExportImageAction" class="org.hisp.dhis.mapping.action.ExportImageAction">
    
              <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
    
              <property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
    
      </bean>
    

Mailing list: https://launchpad.net/~dhis2-devs

Post to : dhis2-devs@lists.launchpad.net

Unsubscribe : https://launchpad.net/~dhis2-devs

More help : https://help.launchpad.net/ListHelp