mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-22 01:58:47 +02:00
Merge branch 'support/3.0' into support/3.1
# Conflicts: # pages/ajax.render.php
This commit is contained in:
@@ -1208,12 +1208,13 @@ EOF
|
||||
'base/layouts/navigation-menu/menu-node'
|
||||
);
|
||||
|
||||
// Important: Mind the back ticks to avoid line breaks to break the JS
|
||||
$oPage->add_script(<<<JS
|
||||
$MenuNameEscaped = utils::HtmlEntities($aValues['name']);
|
||||
// Important: Mind the back ticks to avoid line breaks to break the JS
|
||||
$oPage->add_script(<<<JS
|
||||
$('body').trigger('add_shortcut_node.navigation_menu.itop', {
|
||||
parent_menu_node_id: '{$sMenuGroupId}',
|
||||
new_menu_node_html_rendering: `{$sHtml}`,
|
||||
new_menu_name: `{$aValues['name']}`
|
||||
new_menu_name: `{$MenuNameEscaped}`
|
||||
});
|
||||
JS
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user