dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Bob Jolliffe <bobj@bobj-laptop>
------------------------------------------------------------
revno: 1808 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: gis
timestamp: Wed 2010-04-28 15:04:05 +0200
message:
  Merge with trunk.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editCustomValues.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/selectDataElement.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-dataset/src/main/webapp/dhis-web-maintenance-dataset/editCustomValues.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editCustomValues.vm	2010-03-08 14:50:40 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editCustomValues.vm	2010-04-28 12:41:49 +0000
@@ -331,9 +331,7 @@
   var requestString = 'getSelectedDataElements.action';
   
   var params = 'dataSetId=' + document.getElementById( 'dataSetIdField' ).value;
-        
-  params += '&designCode=' + htmlCode;
-  
+         
   request.sendAsPost( params );
   request.send( requestString );
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/selectDataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/selectDataElement.vm	2009-09-04 10:27:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/selectDataElement.vm	2010-04-28 12:41:49 +0000
@@ -536,9 +536,7 @@
   var requestString = 'getSelectedDataElements.action';
   
   var params = 'dataSetId=' + document.getElementById( 'dataSetIdField' ).value;
-        
-  params += '&designCode=' + htmlCode;
-  
+          
   request.sendAsPost( params );
   request.send( requestString );
 
@@ -767,4 +765,4 @@
 		</tr>									
 		<input type="hidden" name="dataSetIdField" id="dataSetIdField" value="$dataSet.id" />
 </body>
-</html>
\ No newline at end of file
+</html>