=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/duplicateDataEliminationForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/duplicateDataEliminationForm.vm 2011-03-28 15:28:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/duplicateDataEliminationForm.vm 2011-07-07 10:02:27 +0000
@@ -10,10 +10,8 @@
-
-
-
+
+
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/duplicateDataElimination.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/duplicateDataElimination.js 2010-06-30 08:17:25 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/duplicateDataElimination.js 2011-07-07 10:02:27 +0000
@@ -3,21 +3,20 @@
var operandToKeep = 0;
function initLists()
-{
- $.getJSON(
- "../dhis-web-commons-ajax-json/getOperands.action",
- {},
- function( json )
- {
- var operands = json.operands;
-
- for ( var i = 0; i < operands.length; i++ )
- {
- $( "#operandList" ).append( "
" );
- }
+{
+ $("#operandList").dhisAjaxSelect({
+ source: "../dhis-web-commons-ajax-json/getOperands.action",
+ iterator: "operands",
+ handler: function(item) {
+ var option = jQuery("
");
+ option.text( item.operandName );
+ option.attr( "value", item.operandId );
+
+ return option;
}
- );
+ });
+
+ $("#operandList").bind('click', operandSelected);
}
function operandSelected()