Manage ordering - default item - save last search in session (refs #142)

1 files changed, 13 insertions, 6 deletions

diff --git a/ishtar/furnitures/widgets.py b/ishtar/furnitures/widgets.py
index b1d49f660..af22c7b3e 100644
--- a/ishtar/furnitures/widgets.py
+++ b/ishtar/furnitures/widgets.py
@@ -148,7 +148,8 @@ class JQueryJqGrid(forms.RadioSelect):
         rendered += """

 </table>

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

-""" % (name, unicode(_("Search")))

+<h4>%s</h4>

+""" % (name, unicode(_("Search")), unicode(_("Search and select an item")))

         extra_cols = []

         col_names, col_idx = [], []

         for k in self.form.fields:

@@ -160,8 +161,9 @@ class JQueryJqGrid(forms.RadioSelect):
         col_names = col_names and ",".join([""]+col_names) or ""

         col_idx = col_idx and ",".join(col_idx) or ""

         extra_cols = extra_cols and ",".join([""]+extra_cols) or ""

-        rendered += """<table id="grid_%s"></table>

-<input type="hidden" id="hidden_%s" name="%s">""" % (name, name, name)

+        rendered += """<table id="grid_%s" class='jqgrid'></table>

+<div id="pager_%s"></div>

+<input type="hidden" id="hidden_%s" name="%s">""" % (name, name, name, name)

         rendered += """

 <script type="text/javascript">

 var query_vars = new Array(%(col_idx)s);

@@ -188,6 +190,7 @@ jQuery("#search_%(name)s").click(function (){
     mygrid.trigger("reloadGrid");

     return false;

 });

+

 jQuery("#grid_%(name)s").jqGrid({

     url:'%(source)s',

     datatype: "json",

@@ -197,17 +200,21 @@ jQuery("#grid_%(name)s").jqGrid({
 {name:'id', index:'id', hidden:true},

 {name:'value', index:'value'}%(extra_cols)s

     ],

-    jsonReader : {

-    },

     sortname: 'value',

     viewrecords: true,

     sortorder: "asc",

+    emptyrecords: "%(no_result)s",

+    loadtext: "%(loading)s",

+    pager: '#pager_%(name)s',

+    pgbuttons: false,

+    pginput: false,

     width:500

 });

 });

 </script>

 """ % {'name':name, 'col_names':col_names, 'extra_cols':extra_cols,

        'name_label':unicode(_("Name")), 'source':unicode(self.source),

-       'col_idx':col_idx}

+       'col_idx':col_idx, 'no_result':unicode(_("No results")),

+       'loading':unicode(_("Loading..."))}

         return rendered