dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 360
committer: Jan Henrik Overland janhenrik.overland@xxxxxxxxx
branch nick: trunk
timestamp: Mon 2009-06-08 17:44:48 +0200
message:
  DeletionHandler bug fixed.
modified:
  dhis-2/dhis-services/dhis-service-mapping/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java
  gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geostat.js

=== modified file 'dhis-2/dhis-services/dhis-service-mapping/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-mapping/src/main/resources/META-INF/dhis/beans.xml	2009-06-02 12:13:35 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/src/main/resources/META-INF/dhis/beans.xml	2009-06-08 15:44:48 +0000
@@ -68,6 +68,12 @@
       ref="org.hisp.dhis.mapping.MappingService"/>
   </bean>
     
+  <bean id="org.hisp.dhis.mapping.MapViewDeletionHandler"
+    class="org.hisp.dhis.mapping.MapViewDeletionHandler">
+    <property name="mappingService"
+      ref="org.hisp.dhis.mapping.MappingService"/>
+  </bean>
+    
   <!-- Deletion AOP definitions -->
   
   <bean class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
@@ -88,6 +94,7 @@
           <ref local="org.hisp.dhis.mapping.MapDeletionHandler"/>
           <ref local="org.hisp.dhis.mapping.MapLegendSetDeletionHandler"/>
           <ref local="org.hisp.dhis.mapping.MapOrganisationUnitRelationDeletionHandler"/>
+		  <ref local="org.hisp.dhis.mapping.MapViewDeletionHandler"/>
         </list>
       </list>
     </property>

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java	2009-06-05 20:49:17 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java	2009-06-08 15:44:48 +0000
@@ -81,7 +81,6 @@
  * @author Lars Helge Overland
  * @version $Id$
  */
-@SuppressWarnings( "unused" )
 public abstract class DeletionHandler
 {
     // -------------------------------------------------------------------------

=== modified file 'gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geostat.js'
--- gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geostat.js	2009-06-03 11:54:07 +0000
+++ gis/dhis-web-mapping/src/main/webapp/mapping/geostat/geostat.js	2009-06-08 15:44:48 +0000
@@ -541,6 +541,8 @@
                     Ext.getCmp('editmap_cb').reset();
                     Ext.getCmp('deletemap_cb').getStore().reload();
                     Ext.getCmp('deletemap_cb').reset();
+                    Ext.getCmp('mapview_cb').getStore().reload();
+                    Ext.getCmp('mapview_cb').reset();
                 },
                 failure: function()
                 {



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