dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 9600: Minor fix for username type of data element.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Thu, 24 Jan 2013 12:11:18 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 9600
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-01-24 19:08:15 +0700
message:
  Minor fix for username type of  data element.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.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-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm	2012-11-04 11:24:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/dataElement.vm	2013-01-24 12:08:15 +0000
@@ -12,6 +12,7 @@
 	var i18n_yes_no = '$encoder.jsEscape( $i18n.getString( "yes_no" ) , "'")';
 	var i18n_text = '$encoder.jsEscape( $i18n.getString( "text" ) , "'")';
 	var i18n_date = '$encoder.jsEscape( $i18n.getString( "date" ) , "'")';	
+	var i18n_user_name = '$encoder.jsEscape( $i18n.getString( "user_name" ) , "'")';	
 	var i18n_sum = '$encoder.jsEscape( $i18n.getString( "sum" ) , "'")';
 	var i18n_average = '$encoder.jsEscape( $i18n.getString( "average" ) , "'")';
 	var i18n_aggregate = '$encoder.jsEscape( $i18n.getString( "aggregate" ) , "'")';

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js	2013-01-23 08:42:50 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js	2013-01-24 12:08:15 +0000
@@ -97,7 +97,8 @@
 			'bool' : i18n_yes_no,
 			'trueOnly' : i18n_yes_only,
 			'string' : i18n_text,
-			'date' : i18n_date
+			'date' : i18n_date,
+			'username' : i18n_user_name
 		};
 		var type = json.dataElement.valueType;
 		setInnerHTML( 'typeField', typeMap[type] );