another fix when using filters and KeyTable is restarted

paravena · Jan 29, 2013 · 8be7acc · 8be7acc
1 parent d7e4f85
commit 8be7acc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/samples/tablegrid/get_all_cars.php b/samples/tablegrid/get_all_cars.php
@@ -30,8 +30,9 @@
     mysql_select_db("jawdb", $con);
 
     $manuf_id = null;
-    if (isset($_REQUEST['manuf_id']))
-        $page = $_REQUEST['manuf_id'];
+    if (isset($_REQUEST['manuf_id'])) {
+        $manuf_id = $_REQUEST['manuf_id'];
+    }
 
     $query = 'select count(1) ' .
              'from cars_for_sale cfs, ' .
@@ -73,8 +74,13 @@
                  '     car_models cm, ' .
                  '     manufacturers m ' .
                  'where cfs.model_id = cm.model_id and ' .
-                 'cm.manuf_id = m.manuf_id ' .
-                 'order by ' . $sortColumn . ' ' . $ascDescFlg . ') a ' .
+                 'cm.manuf_id = m.manuf_id ';
+
+        if ($manuf_id != null) {
+            $query = $query . ' and m.manuf_id =  ' . $manuf_id;
+        }
+
+        $query = $query . ' order by ' . $sortColumn . ' ' . $ascDescFlg . ') a ' .
                  'limit ' . $from . ',' . $to;
 
         $result = mysql_query($query);

diff --git a/scripts/myui/TableGrid.js b/scripts/myui/TableGrid.js
@@ -144,6 +144,9 @@ MY.TableGrid = Class.create({
                 if (self.options.addDraggingBehavior) self._makeAllColumnDraggable();
                 if (self.options.addSettingBehavior) self._applySettingMenuBehavior();
             }
+            if (self.keys != null) {
+                self.keys.stop();
+            }
             self.keys = new KeyTable(self);
             self._addKeyBehavior();
             if (self.pager) {
@@ -1489,7 +1492,7 @@ MY.TableGrid = Class.create({
         if (this.url) {
             this.request[this.options.sortColumnParameter] = cm[idx].id;
             this.request[this.options.ascDescFlagParameter] = ascDescFlg;
-            this._retrieveDataFromUrl(1);
+            this._retrieveDataFromUrl(1, true);
         } else if (this.rows && this.rows.length > 0) {
             var columnValues = this.getColumnValues(cm[idx].id, false);
             var hashIndex = {};
@@ -1626,7 +1629,6 @@ MY.TableGrid = Class.create({
                     self._toggleLoadingOverlay();
                     self.scrollTop = self.bodyDiv.scrollTop = 0;
                     if (firstTimeFlg) {
-                        if (self.keys != null) self.keys.stop();
                         self.bodyDiv.fire('dom:dataLoaded');
                     }
                 }