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

remember newly set options from get_rows method for server-side validation of nextmatch filters

Browse Source
This commit is contained in:
Ralf Becker 2016-04-05 12:56:10 +00:00
parent fa60745e8e
commit 4835611da4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/src/Etemplate/Widget/Nextmatch.php
View File

@ -658,8 +658,11 @@ class Nextmatch extends Etemplate\Widget
{ {
if($n == 'sel_options') if($n == 'sel_options')
{ {
foreach($row as &$options) foreach($row as $name => &$options)
{ {
// remember newly set options for validation of nextmatch filters
self::$request->sel_options[$name] = $options;
Select::fix_encoded_options($options, true); Select::fix_encoded_options($options, true);
} }
} }
@ -1020,7 +1023,7 @@ class Nextmatch extends Etemplate\Widget
$form_name = self::form_name($cname, $this->id, $expand); $form_name = self::form_name($cname, $this->id, $expand);
$value = self::get_array($content, $form_name); $value = self::get_array($content, $form_name);
// Some (most) extmatch settings are set in its value, not attributes, which aren't in // Some (most) nextmatch settings are set in its value, not attributes, which aren't in
// $content. Fetch them from the request, so we actually have them. // $content. Fetch them from the request, so we actually have them.
$content_value = self::get_array(self::$request->content, $form_name); $content_value = self::get_array(self::$request->content, $form_name);