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

"small improvment of the last commit:

Browse Source 
- also lookup the custom fields from the app mentioned in the template, if there no cfs for the current app, eg. sitemgr contactform
- forward the needed attribute to the cf
- alignment (no spacing, padding) if there are no labels"
This commit is contained in:
Ralf Becker 2007-11-26 17:35:29 +00:00
parent 58750e5997
commit 1258b12e91
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etemplate/inc/class.customfields_widget.inc.php
View File

@ -86,7 +86,7 @@
$config = $this->config->read_repository(); $config = $this->config->read_repository();
//merge old config_name in egw_config table //merge old config_name in egw_config table
$config_name = isset($config['customfields']) ? 'customfields' : 'custom_fields'; $config_name = isset($config['customfields']) ? 'customfields' : 'custom_fields';
$this->customfields = $config[$config_name] ? $config[$config_name] : array('test'=>array('type'=>'label')); $this->customfields = $config[$config_name];
$this->types = $config['types']; $this->types = $config['types'];
$this->advanced_search = $GLOBALS['egw_info']['etemplate']['advanced_search']; $this->advanced_search = $GLOBALS['egw_info']['etemplate']['advanced_search'];
@ -94,7 +94,7 @@
function pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl) function pre_process($name,&$value,&$cell,&$readonlys,&$extension_data,&$tmpl)
{ {
if ($this->appname == 'etemplate') // if we are in the etemplate editor, load the cf's from the app the tpl belongs too if ($this->appname == 'etemplate' || !$this->customfields) // if we are in the etemplate editor or the app has no cf's, load the cf's from the app the tpl belongs too
{ {
list($app) = explode('.',$tmpl->name); list($app) = explode('.',$tmpl->name);
if ($app && $app != $this->appname) $this->customfields_widget(null,$app); if ($app && $app != $this->appname) $this->customfields_widget(null,$app);
@ -284,6 +284,8 @@
{ {
if ($readonly) $input['readonly'] = true; if ($readonly) $input['readonly'] = true;
if ($cell['needed']) $input['needed'] = $cell['needed'];
if (!empty($field['help']) && $row_class != 'th') if (!empty($field['help']) && $row_class != 'th')
{ {
$input['help'] = $field['help']; $input['help'] = $field['help'];
@ -299,7 +301,7 @@
$cell['data'][0]['A'] = '100'; $cell['data'][0]['A'] = '100';
} }
list($span,$class) = explode(',',$cell['span']); // msie (at least 5.5) shows nothing with div overflow=auto list($span,$class) = explode(',',$cell['span']); // msie (at least 5.5) shows nothing with div overflow=auto
$cell['size'] = '100%,100%,0,'.$class.','.($type=='customfields-list'?',0':',').($tmpl->html->user_agent != 'msie' ? ',auto' : ''); $cell['size'] = '100%,100%,0,'.$class.','.(in_array($type,array('customfields-list','customfields-no-label'))?'0,0':',').($tmpl->html->user_agent != 'msie' ? ',auto' : '');
return True; // extra Label is ok return True; // extra Label is ok
} }