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

If user selected a link entry but did not click link, pass it back to application.

Browse Source 
Now fixed to support new entries (no to_id) also.
This commit is contained in:
Nathan Gray 2014-02-25 17:04:43 +00:00
parent 4591fa6e21
commit 22985819b0
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
etemplate/inc/class.etemplate_widget_link.inc.php
View File

@ -260,16 +260,30 @@ class etemplate_widget_link extends etemplate_widget
{ {
$value = $value_in =& self::get_array($content, $form_name); $value = $value_in =& self::get_array($content, $form_name);
// Link widgets can share IDs, make sure to preserve values from others
$already = self::get_array($validated,$form_name);
if($already != null)
{
$value = array_merge($value,$already);
}
// Automatically do link if user selected entry but didn't click 'Link' button // Automatically do link if user selected entry but didn't click 'Link' button
$link = self::get_array($content, self::form_name($cname, $this->id . '_link_entry')); $link = self::get_array($content, self::form_name($cname, $this->id . '_link_entry'));
if($this->type =='link-to' && is_array($link) && $link['app'] && $link['id'] && if($this->type =='link-to' && is_array($link) && $link['app'] && $link['id'] )
is_array($value) && $value['to_id']
)
{ {
$result = egw_link::link($value['to_app'], $value['to_id'], $link['app'], $link['id']); // Do we have enough information to link automatically?
if(is_array($value) && $value['to_id'])
{
$result = egw_link::link($value['to_app'], $value['to_id'], $link['app'], $link['id']);
}
else
{
// Not enough information, leave it to the application
if(!is_array($value['to_id'])) $value['to_id'] = array();
$value['to_id'][] = $link;
}
} }
// Look for files // Look for files - normally handled by ajax
$files = self::get_array($content, self::form_name($cname, $this->id . '_file')); $files = self::get_array($content, self::form_name($cname, $this->id . '_file'));
if(is_array($files) && !(is_array($value) && $value['to_id'])) if(is_array($files) && !(is_array($value) && $value['to_id']))
{ {
@ -284,6 +298,7 @@ class etemplate_widget_link extends etemplate_widget
} }
foreach($files as $name => $attrs) foreach($files as $name => $attrs)
{ {
if(!is_array($value['to_id'])) $value['to_id'] = array();
$value['to_id'][] = array( $value['to_id'][] = array(
'app' => egw_link::VFS_APPNAME, 'app' => egw_link::VFS_APPNAME,
'id' => array( 'id' => array(
@ -296,6 +311,8 @@ class etemplate_widget_link extends etemplate_widget
} }
$valid =& self::get_array($validated, $form_name, true); $valid =& self::get_array($validated, $form_name, true);
$valid = $value; $valid = $value;
error_log($this);
error_log(" " . array2string($valid));
} }
} }
} }