dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3974
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-06-22 09:16:20 +0300
message:
  Fixed bug, oust was missing quotes in <option/> in several places. This made the selected orgunits to not be marked as selected in the DOM.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeSelect.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.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-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm	2011-06-19 10:54:29 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeMultipleSelect.vm	2011-06-22 06:16:20 +0000
@@ -22,7 +22,7 @@
 
 	jQuery.each( jQuery( xml ).find( 'unitId' ), function( i, item ) {
 		id = item.firstChild.nodeValue;
-		selectedOrganisationUnitList__.append( '<option value="' + id + ' selected="selected">' + id + '</option>' );
+		selectedOrganisationUnitList__.append( '<option value="' + id + '" selected="selected">' + id + '</option>' );
 	});
 	#end
 	selectionTree.buildSelectionTree();

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeSelect.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeSelect.js	2011-04-04 16:47:24 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/oust/selectionTreeSelect.js	2011-06-22 06:16:20 +0000
@@ -2,7 +2,7 @@
 
 function addSelectedOrganisationUnit__( id )
 {
-	selectedOrganisationUnitList__.append('<option value="' + id + ' selected="selected">' + id + '</option>');
+	selectedOrganisationUnitList__.append('<option value="' + id + '" selected="selected">' + id + '</option>');
 }
 
 function selectOrganisationUnit__( ids )
@@ -11,7 +11,7 @@
 
 	jQuery.each(ids, function( i, item )
 	{
-		selectedOrganisationUnitList__.append('<option value="' + item + ' selected="selected">' + item	+ '</option>');
+		selectedOrganisationUnitList__.append('<option value="' + item + '" selected="selected">' + item	+ '</option>');
 	});
 	
 	byId('treeSelectedId').selectedIndex = 0;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm	2011-06-19 21:15:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/updateUserForm.vm	2011-06-22 06:16:20 +0000
@@ -107,7 +107,7 @@
 	<tr>
         <td><label for="selectionTree">$i18n.getString( "organisation_unit" )</label></td>
 		<td colspan="3">
-			#organisationUnitSelectionTree( false, true, false )
+			#organisationUnitSelectionTree( false, true, true )
 		</td>
 	</tr>
 	<tr>