← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3292: Data Set Locking - Fixed bug the selected lists are not cleared after selecting a new period type.

 

------------------------------------------------------------
revno: 3292
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-04-06 14:25:53 +0700
message:
  Data Set Locking - Fixed bug the selected lists are not cleared after selecting a new period type.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/datasetLockReport.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-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2011-04-05 06:02:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2011-04-06 07:25:53 +0000
@@ -316,4 +316,5 @@
 get_report_as_xls 													= Download as Excel
 get_report_as_csv 													= Download as CSV
 get_report_as_pdf 													= Download as PDF
-data_element_structure												= Data element structure
\ No newline at end of file
+data_element_structure												= Data element structure
+organisation_not_selected											= There is no organization unit selected
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties	2011-04-05 06:02:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module_vi_VN.properties	2011-04-06 07:25:53 +0000
@@ -291,4 +291,5 @@
 raw_data															= D\u1eef li\u1ec7u \u0111\u01b0\u1ee3c nh\u1eadp v\u00e0o
 get_report_as_xls 													= Xu\u1ea5t t\u1eadp tin Excel
 get_report_as_csv 													= Xu\u1ea5t t\u1eadp tin CSV
-get_report_as_pdf 													= Xu\u1ea5t t\u1eadp tin PDF
\ No newline at end of file
+get_report_as_pdf 													= Xu\u1ea5t t\u1eadp tin PDF
+organisation_not_selected											= Vui l\u00f2ng ch\u1ecdn \u0111\u01a1n v\u1ecb \u0111\u1ec3 ti\u1ebfp t\u1ee5c
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/datasetLockReport.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/datasetLockReport.js	2010-12-21 07:10:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/datasetLockReport.js	2011-04-06 07:25:53 +0000
@@ -100,6 +100,8 @@
 										+ "</option>");
 					});
 			enable("availableDataSets");
+			$('#selectedPeriods >option').remove();
+			$('#selectedDataSets >option').remove();
 		}
 		});
 	}