Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar

1 files changed, 4 insertions, 4 deletions

diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py
index ecc48a1e8..06d6f20f0 100644
--- a/ishtar_common/widgets.py
+++ b/ishtar_common/widgets.py
@@ -206,7 +206,7 @@ class JQueryJqGrid(forms.RadioSelect):
         self.source_full = source_full

 

     def render(self, name, value=None, attrs=None):

-        t = loader.get_template('form_snippet.html')

+        t = loader.get_template('blocks/form_snippet.html')

         rendered = t.render(Context({'form':self.form}))

         rendered += u"\n</table>\n"\

         u"<button id='search_%s' class='submit'>%s</button>" % (

@@ -219,8 +219,8 @@ class JQueryJqGrid(forms.RadioSelect):
         rendered += "\n<h4>%s</h4>\n" % unicode(_("Search and select an item"))

         extra_cols = []

         col_names, col_idx = [], []

-        for k in self.form.fields:

-            field = self.form.fields[k]

+        for k in self.form.get_input_ids():

+            #field = self.form.fields[k]

             col_idx.append(u'"%s"' % k)

         for field_name in getattr(self.associated_model, self.table_cols):

             field = self.associated_model

@@ -292,7 +292,7 @@ class JQueryJqGrid(forms.RadioSelect):
                 }

             }

             var mygrid = jQuery("#grid_%(name)s");

-            var url = "%(source)s?submited=1&amp;" + data;

+            var url = "%(source)s?submited=1&" + data;

             mygrid.setGridParam({url:url});

             mygrid.trigger("reloadGrid");

             return false;