Merge pull request #29 from neomorina/patch-2

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

View File

@ -848,6 +848,16 @@ class Nextmatch extends Etemplate\Widget
//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
// by putting them as children // 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 // add all first level popup actions plus ones with enabled = 'javaScript:...' to action_links