dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6802
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2012-04-28 18:26:03 +0700
message:
  (patient) Selected root orgunit by default in Tabular report.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties
  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/i18n.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/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-04-27 00:59:48 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2012-04-28 11:26:03 +0000
@@ -333,4 +333,5 @@
 show_hide_columns = Show / Hide columns
 favorites = Favorites
 manage_favorites = Manage favorites
-update = Update
\ No newline at end of file
+update = Update
+et_no_programs = Please select an program.
\ No newline at end of file

=== 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-04-27 10:44:52 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-04-28 11:26:03 +0000
@@ -687,7 +687,7 @@
 		validation: {
 			params: function() {
 				if (!TR.c.params.program ) {
-					TR.util.notification.error(TR.i18n.et_invalid_params_setup, TR.i18n.em_invalid_params_setup);
+					TR.util.notification.error(TR.i18n.et_no_programs, TR.i18n.et_no_programs);
 					return false;
 				}
 				return true;
@@ -695,7 +695,7 @@
 			objects: function() {
 				
 				if (TR.cmp.settings.program.getValue() == null) {
-					TR.util.notification.error(TR.i18n.et_no_programss, TR.i18n.et_no_programss);
+					TR.util.notification.error(TR.i18n.et_no_programs, TR.i18n.et_no_programs);
 					return false;
 				}
 				
@@ -1293,32 +1293,9 @@
 													added: function() {
 														TR.cmp.params.organisationunit.treepanel = this;
 													},
-													itemcontextmenu: function(v, r, h, i, e) {
-														if (v.menu) {
-															v.menu.destroy();
-														}
-														v.menu = Ext.create('Ext.menu.Menu', {
-															id: 'treepanel-contextmenu',
-															showSeparator: false
-														});
-														if (!r.data.leaf) {
-															v.menu.add({
-																id: 'treepanel-contextmenu-item',
-																text: TR.i18n.select_all_children,
-																icon: 'images/node-select-child.png',
-																handler: function() {
-																	r.expand(false, function() {
-																		v.getSelectionModel().select(r.childNodes, true);
-																		v.getSelectionModel().deselect(r);
-																	});
-																}
-															});
-														}
-														else {
-															return;
-														}
-														
-														v.menu.showAt(e.xy);
+													afterrender: function( treePanel, eOpts )
+													{
+														treePanel.getSelectionModel().select( treePanel.getRootNode() );
 													}
 												}
 											}

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm	2012-04-27 00:59:48 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/i18n.vm	2012-04-28 11:26:03 +0000
@@ -67,5 +67,6 @@
 are_you_sure:'$encoder.jsEscape($i18n.getString( 'are_you_sure' ) , "'")',
 save:'$encoder.jsEscape($i18n.getString( 'save' ) , "'")',
 save_favorite:'$encoder.jsEscape($i18n.getString( 'save_favorite' ) , "'")',
-overwrite:'$encoder.jsEscape($i18n.getString( 'overwrite' ) , "'")'
+overwrite:'$encoder.jsEscape($i18n.getString( 'overwrite' ) , "'")',
+et_no_programs: '$encoder.jsEscape($i18n.getString( 'et_no_programs' ) , "'")'
 };
\ No newline at end of file