dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1718
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-04-01 10:33:27 +0700
message:
  Organisation unit name is yellow when we haven't chosen it yet.
modified:
  dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/SelectReportAction.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/state/DefaultSelectedStateManager.java
  dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/state/SelectedStateManager.java


--
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-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/SelectReportAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/SelectReportAction.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/action/SelectReportAction.java	2010-04-01 03:33:27 +0000
@@ -146,7 +146,7 @@
         throws Exception
     {  
     	dataSets = new ArrayList<DataSet>( dataSetService.getAllDataSets() );
-    	
+    	selectedStateManager.clearSelectedOrganisationUnits();
     	// ---------------------------------------------------------------------
         // Remove DataSets which don't have a CalendarPeriodType
         // ---------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/state/DefaultSelectedStateManager.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/state/DefaultSelectedStateManager.java	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/state/DefaultSelectedStateManager.java	2010-04-01 03:33:27 +0000
@@ -288,5 +288,7 @@
     {
         return ActionContext.getContext().getSession();
     }   
-  
+    public void clearSelectedOrganisationUnits(){
+        selectionTreeManager.clearSelectedOrganisationUnits();
+    }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/state/SelectedStateManager.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/state/SelectedStateManager.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/dataset/state/SelectedStateManager.java	2010-04-01 03:33:27 +0000
@@ -60,4 +60,6 @@
     void nextPeriodSpan();
 
     void previousPeriodSpan();
+    
+    void clearSelectedOrganisationUnits();
 }