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

Customfields required bugs

Browse Source 
- Load attributes from modifications array, were previously ignored
- Remove double required check, actual field widget should handle it
This commit is contained in:
nathangray 2016-11-07 09:22:33 -07:00
parent 23625effb7
commit 59fc41a5b9
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/Etemplate/Widget/Customfields.php
View File

@ -278,9 +278,11 @@ class Customfields extends Transformer
$type = 'link-to'; $type = 'link-to';
} }
} }
$widget = self::factory($type, '<'.$type.' type="'.$type.'" id="'.self::$prefix.$fname.'"/>', self::$prefix.$fname); $xml = '<'.$type.' type="'.$type.'" id="'.self::$prefix.$fname.'"/>';
$widget = self::factory($type, $xml, self::$prefix.$fname);
$widget->id = self::$prefix.$fname; $widget->id = self::$prefix.$fname;
$widget->attrs['type'] = $type; $widget->attrs['type'] = $type;
$widget->set_attrs($xml);
// some type-specific (default) attributes // some type-specific (default) attributes
switch($type) switch($type)
@ -394,10 +396,6 @@ class Customfields extends Transformer
// widget has no validate method, eg. is only displaying stuff --> nothing to validate // widget has no validate method, eg. is only displaying stuff --> nothing to validate
if (!method_exists($widget, 'validate')) continue; if (!method_exists($widget, 'validate')) continue;
$widget->validate($form_name != self::GLOBAL_ID ? $form_name : $cname, $expand, $content, $validated); $widget->validate($form_name != self::GLOBAL_ID ? $form_name : $cname, $expand, $content, $validated);
if ($field_settings['needed'] && (is_array($value) ? !$value : (string)$value === ''))
{
self::set_validation_error($field,lang('Field must not be empty !!!'),'');
}
$field_name = $this->id[0] == self::$prefix && $customfields[substr($this->id,1)] ? $this->id : self::form_name($form_name != self::GLOBAL_ID ? $form_name : $cname, $field); $field_name = $this->id[0] == self::$prefix && $customfields[substr($this->id,1)] ? $this->id : self::form_name($form_name != self::GLOBAL_ID ? $form_name : $cname, $field);
$valid =& self::get_array($validated, $field_name, true); $valid =& self::get_array($validated, $field_name, true);