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

Set value to a new location using a prefix to avoid changing the original, should fix contact-templates

Browse Source
This commit is contained in:
Nathan Gray 2014-12-10 00:07:23 +00:00
parent bd6af0b94b
commit afcad4b50f
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
etemplate/inc/class.etemplate_widget_entry.inc.php
View File

@ -67,19 +67,31 @@ abstract class etemplate_widget_entry extends etemplate_widget_transformer
$form_name = self::form_name($cname, $this->id); $form_name = self::form_name($cname, $this->id);
$data_id = $attrs['value'] ? self::form_name($cname, $attrs['value']) : self::form_name($cname, self::ID_PREFIX . $this->id); $data_id = $attrs['value'] ? self::form_name($cname, $attrs['value']) : self::form_name($cname, self::ID_PREFIX . $this->id);
// No need to proceed // No need to proceed
if(!$data_id) return; if(!$data_id) return;
// Find out which record to load // Find out which record to load
$value = self::get_array(self::$request->content, $form_name, false, true); $value = self::get_array(self::$request->content, $form_name, false, true);
if(!$value)
// Get the record itself
$data =& self::get_array(self::$request->content, $data_id, true, false);
if(!$data)
{ {
$data =& static::get_entry($value, $attrs); // Try here... legacy / fallback / just make it work
$value = self::get_array(self::$request->content, $data_id, true, false);
$data = static::get_entry($value, $attrs);
} }
else
{
// Get the record itself
$data = self::get_array(self::$request->content, $data_id, true, false);
if(!$data)
{
$data = static::get_entry($value, $attrs);
}
}
// Set the new value so transformer can find it. Use prefix to avoid changing the original value
$new_value =& self::get_array(self::$request->content, self::ID_PREFIX .$this->id, true, false);
$new_value = $data;
$this->id = self::ID_PREFIX . $this->id . "[{$attrs['field']}]"; $this->id = self::ID_PREFIX . $this->id . "[{$attrs['field']}]";
$old_type = self::getElementAttribute($this->id, 'type'); $old_type = self::getElementAttribute($this->id, 'type');