dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4796
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-10-03 10:50:39 +0200
message:
  remove groupfiltering for add/update dataelement/indicator grups.. didnt really make sense
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.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-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm	2011-10-03 08:41:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addDataElementGroupForm.vm	2011-10-03 08:50:39 +0000
@@ -11,14 +11,6 @@
 				option.attr( "value", item.id );
 
 				return option;
-			},
-			filter: {
-				source: "../dhis-web-commons-ajax-json/getDataElementGroups.action",
-				label: 'dataelement group',
-				iterator: "dataElementGroups",
-				handler: function(item) {
-					return "<option data-key='id' data-value='" + item.id + "'>" + item.name + "</option>";
-				}
 			}
 		});
 	});

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm	2011-10-03 08:41:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addIndicatorGroupForm.vm	2011-10-03 08:50:39 +0000
@@ -11,14 +11,6 @@
 				option.attr( "value", item.id );
 
 				return option;
-			},
-			filter: {
-				source: "../dhis-web-commons-ajax-json/getIndicatorGroups.action",
-				iterator: "indicatorGroups",
-				label: 'indicator group',
-				handler: function(item) {
-					return "<option data-key='id' data-value='" + item.id + "'>" + item.name + "</option>";
-				}
 			}
 		});
 	});

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm	2011-10-03 08:41:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateDataElementGroupForm.vm	2011-10-03 08:50:39 +0000
@@ -11,14 +11,6 @@
 				option.attr( "value", item.id );
 
 				return option;
-			},
-			filter: {
-				source: "../dhis-web-commons-ajax-json/getDataElementGroups.action",
-				label: 'dataelement group',
-				iterator: "dataElementGroups",
-				handler: function(item) {
-					return "<option data-key='id' data-value='" + item.id + "'>" + item.name + "</option>";
-				}
 			}
 		});
 	});

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm	2011-10-03 08:41:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/updateIndicatorGroupForm.vm	2011-10-03 08:50:39 +0000
@@ -11,14 +11,6 @@
 				option.attr( "value", item.id );
 
 				return option;
-			},
-			filter: {
-				source: "../dhis-web-commons-ajax-json/getIndicatorGroups.action",
-				iterator: "indicatorGroups",
-				label: 'indicator group',
-				handler: function(item) {
-					return "<option data-key='id' data-value='" + item.id + "'>" + item.name + "</option>";
-				}
 			}
 		});