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

Got the collected reports working again. NSF hasn't been tested yet, because NSF entry is not yet working.

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@402 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-07-28 16:08:15 +00:00
parent aa0a60ea2b
commit 1d6c7436d4
4 changed files with 73 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app_controller.php
View File

@@ -183,11 +183,21 @@ class AppController extends Controller {
'rows' => 20),
$params);
// Unserialize our complex structure of fields
// Unserialize our complex structure of post data.
// This SHOULD always be set, except when debugging
if (isset($params['post']))
$params['post'] = unserialize($params['post']);
// Unserialize our complex structure of dynamic post data
if (isset($params['dynamic_post']))
$params['dynamic_post'] = unserialize($params['dynamic_post']);
// Merge the static and dynamic post data
if (empty($params['post']) && !empty($params['dynamic_post']))
$params['post'] = $params['dynamic_post'];
elseif (!empty($params['post']) && !empty($params['dynamic_post']))
//$params['post'] = array_merge($params['post'], $params['dynamic_post']);
$params['post'] = array_merge_recursive($params['post'], $params['dynamic_post']);
// This SHOULD always be set, except when debugging
if (!isset($params['post']['fields']))
@@ -321,11 +331,11 @@ class AppController extends Controller {
// If the table is already part of the query, append to it
if ($table == $model->alias) {
$query[$link] =
array_merge_recursive($query[$link], $config);
array_merge_recursive($config, $query[$link]);
}
elseif (isset($query[$link][$table])) {
$query[$link][$table] =
array_merge_recursive($query[$link][$table], $config);
array_merge_recursive($config, $query[$link][$table]);
}
elseif (in_array($table, $query[$link])) {
// REVISIT <AP>: 20090727
@@ -357,6 +367,10 @@ class AppController extends Controller {
}
function gridDataFilterTablesTable(&$params, &$model, $table) {
// By default, don't add anything if the filter
// condition occurs on the actual model table
if ($table == $model->alias)
return null;
return $this->gridDataFilterTableName($params, $model, $table);
}