abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modified the filtering behavior; A filter specified as 'Table.field' results in the obvious split (Table, field); 'Table' results in (Table, id); 'field' results in (ModelTable, field). Fixed a bug in the app controller which was allowing 'fields' to leak into the top level of 'link'

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@430 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-07-30 19:45:19 +00:00
parent 07232c77d5
commit 63de30d392
12 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
site/views/transactions/deposit_slip.ctp
View File

@@ -42,9 +42,9 @@ if (0) {
(
'grid_div_id' => "tenders-{$type['id']}-list",
'caption' => $type['name'] . ' Items',
'filter' => array('Tender.deposit_transaction_id'
'filter' => array('deposit_transaction_id'
=> $deposit['Transaction']['id'],
'Tender.tender_type_id'
'TenderType.id'
=> $type['id'],
),
'exclude' => array('Type'),
@@ -57,7 +57,7 @@ else {
'config' => array
(
'caption' => 'Deposited Items',
'filter' => array('Tender.deposit_transaction_id'
'filter' => array('deposit_transaction_id'
=> $deposit['Transaction']['id'],
),
)));

6
site/views/transactions/view.ctp
View File

@@ -73,7 +73,7 @@ if ($transaction['type'] === 'INVOICE' || $transaction['type'] === 'RECEIPT') {
'config' => array
(
'caption' => 'Statement Entries',
'filter' => array('transaction_id' => $transaction['id']),
'filter' => array('Transaction.id' => $transaction['id']),
'exclude' => array('Transaction'),
)));
}
@@ -88,7 +88,7 @@ echo $this->element('ledger_entries', array
'config' => array
(
'caption' => 'Ledger Entries',
'filter' => array('transaction_id' => $transaction['id'],
'filter' => array('Transaction.id' => $transaction['id'],
'Account.id !=' => $account['id']),
'exclude' => array('Transaction'),
)));
@@ -104,7 +104,7 @@ echo $this->element('ledger_entries', array
/* 'config' => array */
/* ( */
/* 'caption' => 'Deposited Items', */
/* 'filter' => array('Tender.deposit_transaction_id' => $transaction['id']), */
/* 'filter' => array('deposit_transaction_id' => $transaction['id']), */
/* ))); */
/* } */