storing (not used) cancel or non-cancel button pressed information now in static class-variable instead of request, to avoid modifying request and causing a save of it

This commit is contained in:
Ralf Becker 2014-01-15 13:46:53 +00:00
parent 60bb090278
commit 6544d38e2c

View File

@ -16,6 +16,19 @@
*/ */
class etemplate_widget_button extends etemplate_widget class etemplate_widget_button extends etemplate_widget
{ {
/**
* True after submit-validation, if cancel button was pressed
*
* @var boolean
*/
public static $canceled = false;
/**
* True after submit-validation,if a non-cancel button was pressed
*
* @var boolean
*/
public static $button_pressed = false;
/** /**
* Validate buttons * Validate buttons
* *
@ -46,14 +59,14 @@ class etemplate_widget_button extends etemplate_widget
$valid =& self::get_array($validated, $form_name, true); $valid =& self::get_array($validated, $form_name, true);
$valid = is_array($value) ? $value : 'pressed'; $valid = is_array($value) ? $value : 'pressed';
// recored pressed button globally, was in the template object before, not sure self::$request is the right place ... // recorded pressed button globally, was in the template object before, put now as static on this object
if ($this->type == 'cancel' || $form_name == 'cancel' || substr($form_name,-10) == '[cancel]') if ($this->type == 'cancel' || $form_name == 'cancel' || substr($form_name,-10) == '[cancel]')
{ {
self::$request->canceled = true; self::$canceled = true;
} }
else else
{ {
self::$request->button_pressed = true; self::$button_pressed = true;
} }
} }
} }