dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2223
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-09-24 14:52:44 +0700
message:
  Fix bug: Cannot edit dataelement into Data Elements and Indicator module.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.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/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm	2010-09-20 10:52:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementForm.vm	2010-09-24 07:52:44 +0000
@@ -3,12 +3,10 @@
 		validation( 'updateDataElementForm', function( form ){			
 			form.submit();
 		},function(){
-			#if ( $calculatedDataElement )
-				getDataElementIdsForValidate();
-				getFactors();	
-			#end	
-				setFieldValue( 'submitCategoryComboId', getFieldValue( 'selectedCategoryComboId' ) );
-				setFieldValue( 'submitValueType', getFieldValue( 'valueType' ) );
+			getDataElementIdsForValidate();
+			getFactors();	
+			setFieldValue( 'submitCategoryComboId', getFieldValue( 'selectedCategoryComboId' ) );
+			setFieldValue( 'submitValueType', getFieldValue( 'valueType' ) );
 		});				
 		
 		checkValueIsExist( "name", "validateDataElement.action", {id:getFieldValue('id')});
@@ -27,9 +25,9 @@
 <h3>$i18n.getString( "edit_data_element" )</h3>
 
 <form id="updateDataElementForm" action="updateDataElement.action" method="post" >
-	<input type="hidden" id="id" name="id" value="$dataElement.id"/>
-	<input type="hidden" id="defaultCategoryCombo" value="$defaultCategoryCombo.id"/>
-	<select name="factors" id="factorsSubmit" multiple="multiple" style="display:none"/>
+	<input type="hidden" id="id" name="id" value="$dataElement.id">
+	<input type="hidden" id="defaultCategoryCombo" value="$defaultCategoryCombo.id">
+	<select name="factors" id="factorsSubmit" multiple="multiple" style="display:none"></select>
 <table>
 	<tr>
 		<th colspan="2">$i18n.getString( "details" )</th>
@@ -85,7 +83,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td><label for="aggregationOperator" id="lblOperator">$i18n.getString( "aggregation_operator" ) <em title="$i18n.getString( "required' )" class="required">*</em></label></td>
+		<td><label for="aggregationOperator" id="lblOperator">$i18n.getString( "aggregation_operator" ) <em title="$i18n.getString( 'required' )" class="required">*</em></label></td>
 		<td>
 			<select id="aggregationOperator" name="aggregationOperator" style="min-width:20em">
 				<option value="sum" #if( $dataElement.aggregationOperator == 'sum' ) selected="selected" #end>$i18n.getString( "sum" )</option>