=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addCategoryOptionGroupSetForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addCategoryOptionGroupSetForm.vm	2015-08-19 11:13:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/addCategoryOptionGroupSetForm.vm	2015-08-20 06:15:51 +0000
@@ -1,23 +1,23 @@
+<script src="javascript/addCategoryOptionGroupSet.js"></script>
 <script type="text/javascript">
-	jQuery(function() {
-        validation('addCategoryOptionGroupSetForm', function ( form ) {
-            form.submit();
-        },function(){
-            $("#cogSelected").find("option").attr("selected", "selected");
-			if(jQuery("#cogSelected option").length > 0 ){
-				setFieldValue('hasOptions', 'true');
-			}
-		});
-
-        checkValueIsExist("name", "validateCategoryOptionGroupSet.action");
-		
-        $('#cogAvailable').selected({
-          url: '../api/categoryOptionGroups.json',
-          target: $('#cogSelected'),
-          search: $('#cogAvailableSearch'),
-          iterator: 'categoryOptionGroups'
-        });
-	});
+  jQuery(function() {
+    dhis2.cogs.clearAndSetAjaxSelect(dhis2.cogs.getType(), false);
+
+    $('#dataDimensionType').on('change', function(e) {
+      dhis2.cogs.clearAndSetAjaxSelect(dhis2.cogs.getType(), true);
+    });
+
+    validation('addCategoryOptionGroupSetForm', function(form) {
+      form.submit();
+    }, function() {
+      $("#cogSelected").find("option").attr("selected", "selected");
+      if( jQuery("#cogSelected option").length > 0 ) {
+        setFieldValue('hasOptions', 'true');
+      }
+    });
+
+    checkValueIsExist("name", "validateCategoryOptionGroupSet.action");
+  });
 </script>
 
 <h3>$i18n.getString( "create_new_category_option_group_set" )</h3>

=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addCategoryOptionGroupSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addCategoryOptionGroupSet.js	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/addCategoryOptionGroupSet.js	2015-08-20 06:15:51 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2004-2015, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+dhis2.util.namespace("dhis2.cogs");
+
+dhis2.cogs = {
+  clearAndSetAjaxSelect: function(type, clearSelected) {
+    var source = '../api/categoryOptionGroups.json';
+
+    if( type !== undefined ) {
+      source += '?filter=dataDimensionType:eq:' + type;
+    }
+
+    if( clearSelected ) {
+      $('#selectedList').children().empty();
+    }
+
+    $('#cogAvailable').selected({
+      url: source,
+      target: $('#cogSelected'),
+      search: $('#cogAvailableSearch'),
+      iterator: 'categoryOptionGroups'
+    });
+  },
+  getType: function() {
+    return $('#dataDimensionType').val().toUpperCase();
+  }
+};