Modified the grid helper to allow a view to directly specify custom post data without wiping out any custom post data set by the element. It's not been used or tested.

git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@401 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-07-28 16:07:34 +00:00
parent d8fe7f9264
commit aa0a60ea2b

View File

@@ -211,7 +211,7 @@ class GridHelper extends AppHelper {
// Incorporate all other user options // Incorporate all other user options
if (isset($config)) if (isset($config))
$this->jqGrid_options = array_merge($this->jqGrid_options, $config); $this->jqGrid_options = array_merge_recursive($this->jqGrid_options, $config);
echo $view->element('jqGrid', $this->jqGrid_options); echo $view->element('jqGrid', $this->jqGrid_options);