Fixed bug created when controller was added as an optional parameter to Links
git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605/site@146 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
@@ -293,14 +293,12 @@ class AppController extends Controller {
|
|||||||
|
|
||||||
function jqGridRecordLinks(&$params, &$model, &$records, $links) {
|
function jqGridRecordLinks(&$params, &$model, &$records, $links) {
|
||||||
foreach ($links AS $table => $fields) {
|
foreach ($links AS $table => $fields) {
|
||||||
|
$special = array('controller', 'id');
|
||||||
$controller = Inflector::pluralize(Inflector::underscore($table));
|
$controller = Inflector::pluralize(Inflector::underscore($table));
|
||||||
$id = 'id';
|
$id = 'id';
|
||||||
if (isset($fields['controller']))
|
extract(array_intersect_key($fields, array_flip($special)));
|
||||||
$controller = $fields['controller'];
|
|
||||||
if (isset($fields['id']))
|
|
||||||
$id = $fields['id'];
|
|
||||||
foreach ($records AS &$record) {
|
foreach ($records AS &$record) {
|
||||||
foreach (array_diff_key($fields, array('id'=>1)) AS $field) {
|
foreach (array_diff_key($fields, array_flip($special)) AS $field) {
|
||||||
// DEBUG PURPOSES ONLY!
|
// DEBUG PURPOSES ONLY!
|
||||||
//$params['linkrecord'][] = compact('table', 'field', 'id', 'controller', 'record');
|
//$params['linkrecord'][] = compact('table', 'field', 'id', 'controller', 'record');
|
||||||
$record[$table][$field] =
|
$record[$table][$field] =
|
||||||
|
|||||||
Reference in New Issue
Block a user