extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29 from neomorina/patch-2

Browse Source 
Made some changes at egw_actions
This commit is contained in:
Nathan Gray 2017-11-10 08:56:55 -07:00 committed by GitHub
commit 43927f0bd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -848,7 +848,17 @@ class Nextmatch extends Etemplate\Widget
//echo "*** Inserting id=$prefix$id"; _debug_array($action);
// we break at end of foreach loop, as rest of actions is already dealt with
// by putting them as children
}
// sets the default attributes to every children dataset
if (is_array($action['children'])) {
foreach ($action['children'] as $key => $children) {
// checks if children is a valid array and if the "$default_attrs" variable exists
if (is_array($action['children'][$key]) && $default_attrs) {
$action['children'][$key] += $default_attrs;
}
}
}
}
// add all first level popup actions plus ones with enabled = 'javaScript:...' to action_links
if ((!isset($action['type']) || in_array($action['type'],array('popup','drag','drop'))) && // popup is the default
@ -1172,4 +1182,4 @@ class Nextmatch extends Etemplate\Widget
}
// Registration needs to go here, otherwise customfields won't be loaded until some other cf shows up
Etemplate\Widget::registerWidget(__NAMESPACE__.'\\Customfields', array('nextmatch-customfields'));
Etemplate\Widget::registerWidget(__NAMESPACE__.'\\Customfields', array('nextmatch-customfields'));