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

Fix child actions under 'More...' did not inherit the inheritable attributes

Browse Source
This commit is contained in:
nathangray 2017-10-13 11:13:17 -06:00
parent 333ec7d1a8
commit db10b21fa7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/src/Etemplate/Widget/Nextmatch.php
View File

@ -843,7 +843,10 @@ class Nextmatch extends Etemplate\Widget
'caption' => 'More', 'caption' => 'More',
'prefix' => $prefix, 'prefix' => $prefix,
// display rest of actions incl. current one as children // display rest of actions incl. current one as children
'children' => array_slice($actions, $max_length-1, count($actions)-$max_length+1, true), 'children' => self::egw_actions(
array_slice($actions, $max_length-1, count($actions)-$max_length+1, true),
$template_name, $prefix, $action_links, $max_length,$default_attrs
)
); );
//echo "*** Inserting id=$prefix$id"; _debug_array($action); //echo "*** Inserting id=$prefix$id"; _debug_array($action);
// we break at end of foreach loop, as rest of actions is already dealt with // we break at end of foreach loop, as rest of actions is already dealt with
@ -875,7 +878,10 @@ class Nextmatch extends Etemplate\Widget
// link or popup action // link or popup action
if ($action['url']) if ($action['url'])
{ {
$action['url'] = Api\Framework::link('/index.php',str_replace('$action',$id,$action['url'])); if(strpos($action['url'], 'http') === false)
{
$action['url'] = Api\Framework::link('/index.php',str_replace('$action',$id,$action['url']));
}
if ($action['popup']) if ($action['popup'])
{ {
list($action['data']['width'],$action['data']['height']) = explode('x',$action['popup']); list($action['data']['width'],$action['data']['height']) = explode('x',$action['popup']);