mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-14 18:08:21 +01:00
- for extensions also trying an extension-specific template-name
- fixed not correct set template after a type change
This commit is contained in:
parent
f3ea79899e
commit
c1b1453108
@ -1189,6 +1189,10 @@
|
|||||||
$msg .= $this->column_actions($action,$parent,$child_id);
|
$msg .= $this->column_actions($action,$parent,$child_id);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case '': // reload, eg. by changing the type
|
||||||
|
$widget = $content['cell'];
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
// all menu's are (only) working on the parent, referencing widget is unnecessary
|
// all menu's are (only) working on the parent, referencing widget is unnecessary
|
||||||
// and gives unexpected results, if parent is changed (eg. content gets copied)
|
// and gives unexpected results, if parent is changed (eg. content gets copied)
|
||||||
@ -1310,7 +1314,10 @@
|
|||||||
|
|
||||||
$editor =& new etemplate('etemplate.editor.widget');
|
$editor =& new etemplate('etemplate.editor.widget');
|
||||||
$type_tmpl =& new etemplate;
|
$type_tmpl =& new etemplate;
|
||||||
if ($type_tmpl->read('etemplate.editor.widget.'.$widget['type']))
|
|
||||||
|
list($ext_type) = explode('-',$widget['type']);
|
||||||
|
if ($type_tmpl->read('etemplate.editor.widget.'.$widget['type']) ||
|
||||||
|
$type_tmpl->read('etemplate.editor.widget.'.$ext_type))
|
||||||
{
|
{
|
||||||
$editor->set_cell_attribute('etemplate.editor.widget.generic','obj',$type_tmpl);
|
$editor->set_cell_attribute('etemplate.editor.widget.generic','obj',$type_tmpl);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user