holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle buttons with missing row_cont info, such as create[...] - they are not considered 'in the row' because the name is not {}[...]

Browse Source
This commit is contained in:
Nathan Gray 2012-06-11 18:14:43 +00:00
parent 04c966a30f
commit d9d842ceb6
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
etemplate/inc/class.etemplate_widget_button.inc.php
View File

@ -32,20 +32,29 @@ class etemplate_widget_button extends etemplate_widget
$form_name = self::form_name($cname, $this->id, $expand);
//error_log(__METHOD__."('$cname', ".array2string($expand).", ...) $this: get_array(\$content, '$form_name')=".array2string(self::get_array($content, $form_name)));
// need to check === true, as get_array() ignores a "[]" postfix and returns array() eg. for a not existing $row_cont[id] in "delete[$row_cont[id]]"
if (!$this->is_readonly($cname, $form_name) && self::get_array($content, $form_name) === true)
if (!$this->is_readonly($cname, $form_name))
{
$valid =& self::get_array($validated, $form_name, true);
$valid = 'pressed'; // that's what it was in old etemplate
$value = self::get_array($content, $form_name);
// recored pressed button globally, was in the template object before, not sure self::$request is the right place ...
if ($this->type == 'cancel' || $form_name == 'cancel' || substr($form_name,-10) == '[cancel]')
if(
// Handle case of not existing $row_cont[id], eg: create[]
is_array($value) && count($value) == 1 ||
// check === true, as get_array() ignores a "[]" postfix and returns array() eg. for a not existing $row_cont[id] in "delete[$row_cont[id]]"
$value == true
)
{
self::$request->canceled = true;
}
else
{
self::$request->button_pressed = true;
$valid =& self::get_array($validated, $form_name, true);
$valid = is_array($value) ? $value : 'pressed';
// recored pressed button globally, was in the template object before, not sure self::$request is the right place ...
if ($this->type == 'cancel' || $form_name == 'cancel' || substr($form_name,-10) == '[cancel]')
{
self::$request->canceled = true;
}
else
{
self::$request->button_pressed = true;
}
}
}
}