extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do disabled check before grid name expansion, so disabled=!@grid_id will work

Browse Source
This commit is contained in:
Nathan Gray 2014-06-09 19:24:48 +00:00
parent 0246dec560
commit 0a1c0e5135
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
etemplate/inc/class.etemplate_widget_grid.inc.php
View File

@ -68,12 +68,7 @@ class etemplate_widget_grid extends etemplate_widget_box
$expand =& $params[1]; $expand =& $params[1];
$old_cname = $params[0]; $old_cname = $params[0];
$old_expand = $params[1]; $old_expand = $params[1];
if ($this->id) $cname = self::form_name($cname, $this->id, $expand);
if ($expand['cname'] !== $cname && $cname)
{
$expand['cont'] =& self::get_array(self::$request->content, $cname);
$expand['cname'] = $cname;
}
// as a grid can contain other grid's as direct child, we have to backup and initialise $columns_disabled // as a grid can contain other grid's as direct child, we have to backup and initialise $columns_disabled
if ($this->type == 'grid') if ($this->type == 'grid')
{ {
@ -88,6 +83,14 @@ class etemplate_widget_grid extends etemplate_widget_box
$params[1] = $old_expand; $params[1] = $old_expand;
return false; // return return false; // return
} }
if ($this->id) $cname = self::form_name($cname, $this->id, $expand);
if ($expand['cname'] !== $cname && $cname)
{
$expand['cont'] =& self::get_array(self::$request->content, $cname);
$expand['cname'] = $cname;
}
if (method_exists($this, $method_name)) if (method_exists($this, $method_name))
{ {
call_user_func_array(array($this, $method_name), $params); call_user_func_array(array($this, $method_name), $params);