More tweaking to all of the grid displays. This was mostly visual, but includes some bug fixes as well (such as a manual filter override in the ledger_entries controller).

git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@371 97e9348a-65ac-dc4b-aefc-98561f571b83

controllers/accounts_controller.php

@@ -59,6 +59,10 @@ class AccountsController extends AppController {
   }
 
   function gridDataCountTables(&$params, &$model) {
+    // Our count should NOT include anything extra,
+    // so we need the virtual function to prevent
+    // the base class from just calling our
+    // gridDataTables function
     return parent::gridDataTables($params, $model);
   }
 

controllers/ledger_entries_controller.php

@@ -56,6 +56,15 @@ class LedgerEntriesController extends AppController {
 		       $this->LedgerEntry->debitCreditFields());
   }
 
+  function gridDataFilterTablesTable(&$params, &$model, $table) {
+    $table = $this->gridDataFilterTableName($params, $model, $table);
+    // Account is already part of our standard table set.
+    // Ensure we don't add it in again as part of filtering.
+    if ($table == 'Account')
+      return null;
+    return $table;
+  }
+
   function gridDataOrder(&$params, &$model, $index, $direction) {
 /*     if ($index === 'balance') */
 /*       return ($index .' '. $direction); */

controllers/ledgers_controller.php

@@ -50,7 +50,11 @@ class LedgersController extends AppController {
   }
 
   function gridDataCountTables(&$params, &$model) {
-    return array('contain' => false);
+    // Our count should NOT include anything extra,
+    // so we need the virtual function to prevent
+    // the base class from just calling our
+    // gridDataTables function.
+    return parent::gridDataTables($params, $model);
   }
 
   function gridDataTables(&$params, &$model) {