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

Undid the change from r401, since it wasn't being used and was interferring with the specification of sort_column. If we really want that functionality, we can add it in when needed and come up with a more general solution for view specific sorting as well.

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@484 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-08-04 22:09:18 +00:00
parent 67280c89e7
commit 11d5deac85
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
site/views/helpers/grid.php
View File

@@ -211,8 +211,9 @@ class GridHelper extends AppHelper {
// Incorporate all other user options
if (isset($config))
$this->jqGrid_options = array_merge_recursive($this->jqGrid_options, $config);
$this->jqGrid_options = array_merge($this->jqGrid_options, $config);
//pr(compact('config') + array('jqGrid_options' => $this->jqGrid_options));
echo $view->element('jqGrid', $this->jqGrid_options);
// Since we only have one instance of this class