dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17872
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2015-01-03 11:52:35 +0100
message:
  Missing methods on DeletionHandler
modified:
  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filter.js


--
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-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	2014-10-23 10:07:41 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java	2015-01-03 10:52:35 +0000
@@ -54,6 +54,7 @@
 import org.hisp.dhis.eventchart.EventChart;
 import org.hisp.dhis.eventreport.EventReport;
 import org.hisp.dhis.expression.Expression;
+import org.hisp.dhis.filter.MetaDataFilter;
 import org.hisp.dhis.i18n.locale.I18nLocale;
 import org.hisp.dhis.indicator.Indicator;
 import org.hisp.dhis.indicator.IndicatorGroup;
@@ -495,6 +496,15 @@
     {
         return null;
     }
+    
+    public void deleteMetaDataFilter( MetaDataFilter metaDataFilter )
+    {
+    }
+    
+    public String allowDeleteMetaDataFilter( MetaDataFilter metaDataFilter )
+    {
+        return null;
+    }
 
     public void deleteTrackedEntityInstance( TrackedEntityInstance entityInstance )
     {

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filter.js'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filter.js	2014-07-27 15:13:21 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/filter.js	2015-01-03 10:52:35 +0000
@@ -75,9 +75,7 @@
 }
 
 function removeFilterButton( context )
-{
-	// TODO this must be done properly
-	
+{	
 	$.ajax( {
 		url: '../api/metaDataFilters/' + context.uid,
 		type: 'delete',