← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2706: Removed header message when deleting item, looks silly when the object is quick to delete

 

------------------------------------------------------------
revno: 2706
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-01-21 14:39:40 +0100
message:
  Removed header message when deleting item, looks silly when the object is quick to delete
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/criteria.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-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	2011-01-21 13:26:42 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2011-01-21 13:39:40 +0000
@@ -738,8 +738,6 @@
     
     if ( result )
     {
-
-		setHeaderWaitMessage( i18n_process );
     	$.postJSON(
     	    action,
     	    {
@@ -762,7 +760,6 @@
     	    	{ 
 					showWarningMessage( json.message );
     	    	}
-				hideHeaderMessage();
     	    }
     	);
     }

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/criteria.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/criteria.js	2011-01-21 13:14:16 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/criteria.js	2011-01-21 13:39:40 +0000
@@ -44,6 +44,8 @@
         
         addOption( list, name, name );
       }
+      
+      $( "#periodType option[value=Monthly]" ).attr( "selected", "selected" );
     }
   );
 }