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

Entry type / transformer changes

Browse Source 
- better support for entry-types in nextmatch-customfilter
- if transformer changes widget type, run new widget's beforeSendToClient
This commit is contained in:
Nathan Gray 2015-02-18 23:04:59 +00:00
parent 12b8dc1ed4
commit b1b1269e0e
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etemplate/inc/class.etemplate_widget_nextmatch.inc.php
View File

@ -1207,8 +1207,8 @@ class etemplate_widget_nextmatch_customfilter extends etemplate_widget_transform
$this->setElementAttribute($form_name, 'options', trim($this->attrs['widget_options']) != '' ? $this->attrs['widget_options'] : ''); $this->setElementAttribute($form_name, 'options', trim($this->attrs['widget_options']) != '' ? $this->attrs['widget_options'] : '');
parent::beforeSendToClient($cname, $expand);
$this->setElementAttribute($form_name, 'type', $this->attrs['type']); $this->setElementAttribute($form_name, 'type', $this->attrs['type']);
parent::beforeSendToClient($cname, $expand);
} }
} }

12
etemplate/inc/class.etemplate_widget_transformer.inc.php
View File

@ -122,6 +122,7 @@ abstract class etemplate_widget_transformer extends etemplate_widget
//echo $this; _debug_array($unmodified); _debug_array($attrs); _debug_array(array_diff_assoc($attrs, $unmodified)); //echo $this; _debug_array($unmodified); _debug_array($attrs); _debug_array(array_diff_assoc($attrs, $unmodified));
// compute the difference and send it to the client as modifications // compute the difference and send it to the client as modifications
$type_changed = false;
foreach(array_diff_assoc($attrs, $unmodified) as $attr => $val) foreach(array_diff_assoc($attrs, $unmodified) as $attr => $val)
{ {
switch($attr) switch($attr)
@ -136,6 +137,7 @@ abstract class etemplate_widget_transformer extends etemplate_widget
self::$request->sel_options[$form_name] = $val; self::$request->sel_options[$form_name] = $val;
break; break;
case 'type': // not an attribute in etemplate2 case 'type': // not an attribute in etemplate2
$type_changed = true;
if($val == 'template') if($val == 'template')
{ {
// If the widget has been transformed into a template, we // If the widget has been transformed into a template, we
@ -146,12 +148,22 @@ abstract class etemplate_widget_transformer extends etemplate_widget
$this->expand_widget($transformed_template, $expand); $this->expand_widget($transformed_template, $expand);
$transformed_template->run('beforeSendToClient',array($cname,$expand)); $transformed_template->run('beforeSendToClient',array($cname,$expand));
} }
$type_changed = false;
} }
default: default:
self::setElementAttribute($form_name, $attr, $val); self::setElementAttribute($form_name, $attr, $val);
break; break;
} }
} }
if($type_changed)
{
// Run the new widget type's beforeSendToClient
$expanded_child = self::factory($attrs['type'], false,$this->id);
$expanded_child->id = $this->id;
$expanded_child->type = $attrs['type'];
$expanded_child->attrs = $attrs;
$expanded_child->run('beforeSendToClient',array($cname,$expand));
}
} }
/** /**

2
etemplate/js/et2_widget_entry.js
View File

@ -150,4 +150,4 @@ var et2_entry = et2_valueWidget.extend(
} }
}); });
et2_register_widget(et2_entry, ["entry", 'contact-value', 'contact-account', 'contact-template', 'infolog-value','tracker-value']); et2_register_widget(et2_entry, ["entry", 'contact-value', 'contact-account', 'contact-template', 'infolog-value','tracker-value','records-value']);