dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11039
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-05-28 09:52:46 +0200
message:
  Using header message field for object deleted notification
modified:
  dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties


--
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-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java	2013-05-27 19:21:48 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java	2013-05-28 07:52:46 +0000
@@ -420,9 +420,7 @@
         addIfEmpty( reportTable.getGridColumns() ); 
         addIfEmpty( reportTable.getGridRows() );
 
-        Grid grid = reportTable.getGrid( new ListGrid(), valueMap, false );
-        
-        return grid;
+        return reportTable.getGrid( new ListGrid(), valueMap, false );
     }
     
     @Override

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.vm	2012-10-21 12:56:21 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.vm	2013-05-28 07:52:46 +0000
@@ -77,6 +77,7 @@
 var i18n_please_select_indicator = '$encoder.jsEscape($i18n.getString( 'please_select_indicator' ) , "'")';
 var i18n_please_enter_description = '$encoder.jsEscape($i18n.getString( 'please_enter_description' ) , "'")';
 var i18n_delete_confirm = '$encoder.jsEscape($i18n.getString( 'delete_confirm' ) , "'")';
+var i18n_deleting = '$encoder.jsEscape($i18n.getString( 'deleting' ) , "'")';
 var i18n_ok = '$encoder.jsEscape($i18n.getString( 'ok' ) , "'")';
 var i18n_cancel = '$encoder.jsEscape($i18n.getString( 'cancel' ) , "'")';
 var i18n_edit = '$encoder.jsEscape($i18n.getString( 'edit' ) , "'")';

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2013-04-19 14:12:51 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2013-05-28 07:52:46 +0000
@@ -826,6 +826,8 @@
     
     if ( result )
     {
+    	setHeaderWaitMessage( i18n_deleting );
+    	
     	$.postJSON(
     	    action,
     	    {
@@ -847,11 +849,11 @@
 						success.call();
 					}
   
-					showSuccessMessage( i18n_delete_success );
+					setHeaderDelayMessage( i18n_delete_success );
     	    	}
     	    	else if ( json.response == "error" )
     	    	{ 
-					showWarningMessage( json.message );
+					setHeaderMessage( json.message );
     	    	}
     	    }
     	);

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-05-26 15:07:15 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-05-28 07:52:46 +0000
@@ -143,13 +143,14 @@
 save=Save
 new=New
 back=Back
-ok=Ok
+ok=OK
 cancel=Cancel
 add=Add
 edit=Edit
 reply=Reply
 update=Update
 delete=Delete
+deleting=Deleting
 close=Close
 gender_male=Male
 gender_female=Female