diff --git a/module/tree/model.php b/module/tree/model.php index 387b2aeab1..3154bb34ad 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -613,7 +613,7 @@ class treeModel extends model { $childMenu = isset($treeMenu[0]) ? "" : ''; $link = helper::createLink('project', 'story', "project=$rootID&ordery=&status=byBranch&praram=$branch"); - $treeMenu[0] = "
  • " . html::a($link, $branchName, '_self', "id='branch$branch'") . "{$childMenu}
  • "; + if($branchName) $treeMenu[0] = "
  • " . html::a($link, $branchName, '_self', "id='branch$branch'") . "{$childMenu}
  • "; } $tree .= isset($treeMenu[0]) ? $treeMenu[0] : ''; } diff --git a/www/js/my.full.js b/www/js/my.full.js index d4c4833932..5ab6d30827 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -2042,4 +2042,17 @@ $(document).ready(function() initHelpLink(); checkTutorial(); revertModuleCookie(); + + /* Adjust for dropdown position. */ + $('li.dropdown-submenu').mouseover(function() + { + $('li.dropdown-submenu > .dropdown-menu').each(function() + { + if($(this).css('display') == 'block') + { + var topPosition = $(this).offset().top; + if(topPosition < 0) $(this).css('bottom', Number($(this).css('bottom').replace('px', '')) + topPosition); + } + }) + }) });