dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7510
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-07-05 13:37:26 +0700
message:
  Error display into Update Patient Form when to delete an available patient-attribute.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.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-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm	2012-07-04 05:06:10 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/updatePatientForm.vm	2012-07-05 06:37:26 +0000
@@ -179,8 +179,8 @@
 		<tr><td>&nbsp;</td></tr>	
 		<tr><th colspan="2" class="heading-column">$attributeGroup.name</th></tr>
 		#foreach($attribute in $attributeGroup.attributes)
-			#if( $attribute.program )
-			#else
+			#if( $!attribute && $attribute.program )
+			#elseif( $!attribute )
 				#set( $attributeValue = "" )
 				#set( $attributeValue = $!patientAttributeValueMap.get( $attribute.id ) )
 				<tr>
@@ -219,8 +219,10 @@
 	#if ( $noGroupAttributes && $noGroupAttributes.size() > 0) 	
 		<tr><th colspan="2" class="heading-column">$i18n.getString( "Other details" )</th></tr>
 		#foreach($attribute in $noGroupAttributes )
-		#set( $attributeValue = "" )
-		#set( $attributeValue = $!patientAttributeValueMap.get( $attribute.id ) )
+		#if( $!attribute && $attribute.program )
+		#elseif( $!attribute )
+			#set( $attributeValue = "" )
+			#set( $attributeValue = $!patientAttributeValueMap.get( $attribute.id ) )
 			<tr>
 				<td class='text-column'><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
 				<td class="input-column">
@@ -247,6 +249,7 @@
 					#end
 				</td>		
 			</tr>
+			#end
 		#end
 	#end
 	<tr>