extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not die if select custom field is not fully set up

Browse Source
This commit is contained in:
Nathan Gray 2015-09-21 19:43:36 +00:00
parent d18a0578b1
commit 8e657aeb0e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/inc/class.customfields.inc.php
View File

@ -68,6 +68,7 @@ class customfields
* @var Description of the options or value format for each cf_type * @var Description of the options or value format for each cf_type
*/ */
public static $type_option_help = array( public static $type_option_help = array(
'search' => 'set get_rows, get_title and id_field, or use @path to read options from a file in EGroupware directory',
'select' => 'each value is a line like id[=label], or use @path to read options from a file in EGroupware directory', 'select' => 'each value is a line like id[=label], or use @path to read options from a file in EGroupware directory',
'radio' => 'each value is a line like id[=label], or use @path to read options from a file in EGroupware directory', 'radio' => 'each value is a line like id[=label], or use @path to read options from a file in EGroupware directory',
'button' => 'each value is a line like label=[javascript]' 'button' => 'each value is a line like label=[javascript]'

9
etemplate/js/et2_extension_customfields.js
View File

@ -438,11 +438,14 @@ var et2_customfields_list = et2_valueWidget.extend([et2_IDetachedDOM, et2_IInput
}, },
_setup_ajax_select: function(field_name, field, attrs) { _setup_ajax_select: function(field_name, field, attrs) {
var attributes = ['get_rows','get_title','id_field','template']; var attributes = ['get_rows','get_title','id_field','template'];
for(var i = 0; i < attributes.length; i++) if(field.values)
{ {
if(typeof field.values[attributes[i]] !== 'undefined') for(var i = 0; i < attributes.length; i++)
{ {
attrs[attributes[i]] = field.values[attributes[i]]; if(typeof field.values[attributes[i]] !== 'undefined')
{
attrs[attributes[i]] = field.values[attributes[i]];
}
} }
} }
return true; return true;