Fix land planning service form (refs #2999)

3 files changed, 34 insertions, 33 deletions

diff --git a/ishtar_common/templates/blocks/JQueryAutocomplete.js b/ishtar_common/templates/blocks/JQueryAutocomplete.js
index 8616ff928..16ffef3a0 100644
--- a/ishtar_common/templates/blocks/JQueryAutocomplete.js
+++ b/ishtar_common/templates/blocks/JQueryAutocomplete.js
@@ -2,37 +2,39 @@
 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_{{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);
-            }
-        },
-    minLength: 2{% if options %},
-    {{options}}
-    {% endif %}
-});
+$(function() {
+    $("#id_select_{{field_id}}").autocomplete({
+        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);
+                }
+            },
+        minLength: 2{% if options %},
+        {{options}}
+        {% endif %}
+    });
 
-$(document).on("click", '#id_select_{{field_id}}', function(){
-    $('#id_{{field_id}}').val(null);
-    $('#id_select_{{field_id}}').val(null);
-});
+    $(document).on("click", '#id_select_{{field_id}}', function(){
+        $('#id_{{field_id}}').val(null);
+        $('#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);
-    }
+    {% 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 %}
 });
-$('#{{item_id}}').change();
-{% endfor %}{% endif %}
diff --git a/ishtar_common/templates/ishtar/organization_form.html b/ishtar_common/templates/ishtar/organization_form.html
index 28415ab88..21d5ffa9e 100644
--- a/ishtar_common/templates/ishtar/organization_form.html
+++ b/ishtar_common/templates/ishtar/organization_form.html
@@ -48,14 +48,13 @@ function checkPendingRequest(todo) {
         if ($.active > 0) {
             window.setTimeout(checkPendingRequest(todo), 250);
         } else {
-            todo(); 
+            todo();
         }
     }, 250);
 };
 
 person_save_callback = function(){
     var item_id = $('#hidden_organization_pk').val();
-
     var url = edit_url;
     $('#id_' + parent_id).val(null);
     if (item_id){
diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py
index 2aa9b12f6..dc6324b79 100644
--- a/ishtar_common/widgets.py
+++ b/ishtar_common/widgets.py
@@ -292,7 +292,7 @@ class JQueryAutoComplete(forms.TextInput):
         html = u'''<input%(attrs_select)s/>%(new)s\
 <input type="hidden"%(attrs_hidden)s/>\
         <script type="text/javascript"><!--//
-        $(function() {%(js)s});//--></script>
+        %(js)s//--></script>
         ''' % {
             'attrs_select': flatatt(attrs_select),
             'attrs_hidden': flatatt(attrs_hidden),