From ec7360d36f8751ce68f9a84c05175ccabbd612dd Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 5 Feb 2014 17:17:45 +0000 Subject: [PATCH] If application changed actions in get_rows(), the new actions need to be sent through etemplate_widget_nextmatch::egw_actions(). Now doing so automatically. Fixes js error in infolog refresh. --- etemplate/inc/class.etemplate_widget_nextmatch.inc.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php index 689cd97f3b..fa8e5c74a6 100644 --- a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php +++ b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php @@ -342,6 +342,15 @@ class etemplate_widget_nextmatch extends etemplate_widget // These keys we don't send row data back, as they cause a partial reload if(in_array($key, array('template'))) $no_rows = true; + // Actions still need extra handling + if($key == 'actions' && !isset($value['actions'][0])) + { + $value['action_links'] = array(); + $template_name = isset($value['template']) ? $value['template'] : ''; + if (!is_array($value['action_links'])) $value['action_links'] = array(); + $value['actions'] = self::egw_actions($value['actions'], $template_name, '', $value['action_links']); + } + $changes = true; $request_value[$key] = $value[$key];