1 files changed, 20 insertions, 1 deletions
diff --git a/ishtar_common/templates/blocks/JQueryAutocomplete.js b/ishtar_common/templates/blocks/JQueryAutocomplete.js
index eb365c38a..038acf1ba 100644
--- a/ishtar_common/templates/blocks/JQueryAutocomplete.js
+++ b/ishtar_common/templates/blocks/JQueryAutocomplete.js
@@ -1,8 +1,13 @@
+{% load replace_underscore %}
+var base_source_{{field_id|replace_underscore}} = {{source}};
+var source_{{field_id|replace_underscore}} = base_source_{{field_id|replace_underscore}};
+
 $("#id_select_{{field_id}}").autocomplete({
-    source: {{source}},
+    source: source_{{field_id|replace_underscore}},
     select: function( event, ui ) {
             if(ui.item){
                 $('#id_{{field_id}}').val(ui.item.id);
+                $('#id_{{field_id}}').change();
             } else {
                 $('#id_{{field_id}}').val(null);
             }
@@ -17,3 +22,17 @@ $('#id_select_{{field_id}}').live('click', function(){
     $('#id_select_{{field_id}}').val(null);
 });
 
+
+{% if dynamic_limit %}{% for item_id in dynamic_limit %}
+$('#{{item_id}}').change(function(){
+    $("#id_select_{{field_id}}").autocomplete( "option", "source",
+        base_source_{{field_id|replace_underscore}} + $('#{{item_id}}').val()
+        + '/');
+    if ($('#{{item_id}}').val()){
+        $("#id_select_{{field_id}}").prop("disabled", false);
+    } else {
+        $("#id_select_{{field_id}}").prop("disabled", true);
+    }
+});
+$('#{{item_id}}').change();
+{% endfor %}{% endif %}