dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3022
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-03-14 14:06:31 +0700
message:
  Fix bug:  Dataelement/indicator group editor not sorted.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/UpdateIndicatorGroupAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView.vm


--
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-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/UpdateIndicatorGroupAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/UpdateIndicatorGroupAction.java	2011-03-14 03:41:53 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroup/UpdateIndicatorGroupAction.java	2011-03-14 07:06:31 +0000
@@ -111,9 +111,10 @@
             }
 
             indicatorGroup.setMembers( members );
-        }else
+        }
+        else
         {
-            indicatorGroup.setMembers( null );
+            indicatorGroup.getMembers().clear();
         }
 
         indicatorService.updateIndicatorGroup( indicatorGroup );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView.vm	2011-03-14 03:30:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElementGroupEditorView.vm	2011-03-14 07:06:31 +0000
@@ -179,6 +179,7 @@
 		}
 		
 		sortList( 'availableDataElements', 'ASC' );
+		sortList( 'availableDataElements2', 'ASC' );
 		list_1.find(":first").attr("selected", "selected");		
 		list_2.find(":first").attr("selected", "selected");		
 		
@@ -201,6 +202,8 @@
 				list_2.append('<option value="' + id + '">' + text + '</option>' );
 			}
 		}
+		sortList( 'dataElementGroups', 'ASC' );
+		sortList( 'availableGroups', 'ASC' );
 		list_1.find(":first").attr("selected", "selected");		
 		list_2.find(":first").attr("selected", "selected");	
 		

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView.vm	2011-03-14 03:30:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/indicatorGroupEditorView.vm	2011-03-14 07:06:31 +0000
@@ -185,6 +185,7 @@
 		}
 		
 		sortList( 'availableIndicators', 'ASC' );
+		sortList( 'availableIndicators2', 'ASC' );
 		list_1.find(":first").attr("selected", "selected");		
 		list_2.find(":first").attr("selected", "selected");		
 		
@@ -207,6 +208,9 @@
 				list_2.append('<option value="' + id + '">' + text + '</option>' );
 			}
 		}
+		
+		sortList( 'indicatorGroups', 'ASC' );
+		sortList( 'availableGroups', 'ASC' );
 		list_1.find(":first").attr("selected", "selected");		
 		list_2.find(":first").attr("selected", "selected");