tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-10764-favoritos-y-nuevos-menus' into 'develop' 

Ent 10764 favoritos y nuevos menus

See merge request artica/pandorafms!5618
This commit is contained in:
Matias Didier 2023-03-27 09:01:48 +00:00
parent 78bc8e4f50 a21e43a452
commit 2daea0e5c4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/include/functions_menu.php
View File

@ -268,6 +268,7 @@ function menu_print_menu(&$menu)
if (($sec2 == $subsec2 || $allsec2 == $subsec2
|| $selected_submenu2) && isset($sub[$subsec2]['options'])
&& (get_parameter_get($sub[$subsec2]['options']['name']) == $sub[$subsec2]['options']['value'])
&& $main['id'] !== 'fav-menu'
) {
// If the subclass is selected and there are options and that options value is true.
$class .= 'submenu_selected selected';
@ -275,7 +276,7 @@ function menu_print_menu(&$menu)
$menu2_selected = $sub['id'];
$selected = true;
$visible = true;
} else if (($sec2 === $subsec2 || $allsec2 === $subsec2 || $selected_submenu2 === true) && isset($sub[$subsec2]['options']) === false) {
} else if (($sec2 === $subsec2 || $allsec2 === $subsec2 || $selected_submenu2 === true) && isset($sub[$subsec2]['options']) === false && $main['id'] !== 'fav-menu') {
$class .= 'submenu_selected selected';
$selected = true;
$menu_selected = true;
@ -397,7 +398,7 @@ function menu_print_menu(&$menu)
$class = 'sub_subMenu';
if ($key == $sec2) {
if ($key == $sec2 && $main['id'] !== 'fav-menu') {
$class .= ' selected';
}

2
pandora_console/operation/menu.php
View File

@ -618,7 +618,7 @@ if ($favorite_menu !== false) {
$sub[$section]['text'] = __(str_replace('_', ' ', $section));
$sub[$section]['type'] = 'direct';
$sub[$section]['subtype'] = 'nolink';
$sub[$section]['id'] = $row['section'];
$sub[$section]['id'] = $row['section'].'-fav-menu';
$sub2[$row['url']]['text'] = io_safe_output($row['label']);
$sub[$section]['sub2'] = $sub2;