dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 215
committer: Jan Henrik Overland janhenrik.overland@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-04-21 15:10:55 +0200
message:
  New, edit and delete map now working. equals() bug in Map.java fixed.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java
  gis/dhis-web-mapping/src/main/webapp/demos/geostat/geostat.js

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java	2009-04-14 12:17:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java	2009-04-21 13:10:55 +0000
@@ -29,7 +29,6 @@
 
 import java.util.Set;
 
-import org.hisp.dhis.chart.Chart;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
 
@@ -105,9 +104,9 @@
             return false;
         }
         
-        Chart other = (Chart) object;
+        Map other = (Map) object;
         
-        return mapLayerPath.equals( other.getTitle() );
+        return mapLayerPath.equals( other.mapLayerPath );
     }
     
     // -------------------------------------------------------------------------

=== modified file 'gis/dhis-web-mapping/src/main/webapp/demos/geostat/geostat.js'
--- gis/dhis-web-mapping/src/main/webapp/demos/geostat/geostat.js	2009-04-21 11:52:50 +0000
+++ gis/dhis-web-mapping/src/main/webapp/demos/geostat/geostat.js	2009-04-21 13:10:55 +0000
@@ -357,7 +357,7 @@
             
             Ext.Ajax.request(
             {
-                url: path + 'deleteMapByMapLayerPath' + type,
+                url: path + 'deleteMap' + type,
                 method: 'GET',
                 params: { mapLayerPath: mlp },
 



--
Trunk
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.