dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7581
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-07-12 12:24:01 +0700
message:
  Fix bug validation in the Tabular report.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js


--
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/app/app.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-07-12 02:49:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-07-12 05:24:01 +0000
@@ -1435,7 +1435,7 @@
 					},
 					validateedit: function( editor, e, eOpts )
 					{
-						if( e.column.compulsory && e.value =='' )
+						if( e.column.compulsory && e.column.field.rawValue =='' )
 						{
 							TR.util.notification.error( TR.i18n.not_empty, TR.i18n.not_empty );
 							return false;
@@ -1490,13 +1490,13 @@
 				if( type.toLowerCase() == 'bool' ){
 					params.editor.store = new Ext.data.ArrayStore({
 						fields: ['value', 'name'],
-						data: [['true', TR.i18n.true_value], ['false', TR.i18n.false_value]]
+						data: [['', ''],['true', TR.i18n.true_value], ['false', TR.i18n.false_value]]
 					});
 				}
 				else{
 					params.editor.store = new Ext.data.ArrayStore({
 						fields: ['value', 'name'],
-						data: [['', TR.i18n.none], ['true', TR.i18n.true_value]]
+						data: [['', ''], ['true', TR.i18n.true_value]]
 					});
 				}
 			}