Merge branch 'master' of https://github.com/easysoft/zentaopms

module/tree/model.php

@@ -613,7 +613,7 @@ class treeModel extends model
                 {
                     $childMenu = isset($treeMenu[0]) ? "<ul>{$treeMenu[0]}</ul>" : '';
                     $link      = helper::createLink('project', 'story', "project=$rootID&ordery=&status=byBranch&praram=$branch");
-                    $treeMenu[0] = "<li>" . html::a($link, $branchName, '_self', "id='branch$branch'") . "{$childMenu}</li>";
+                    if($branchName) $treeMenu[0] = "<li>" . html::a($link, $branchName, '_self', "id='branch$branch'") . "{$childMenu}</li>";
                 }
                 $tree .= isset($treeMenu[0]) ? $treeMenu[0] : '';
             }

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);
+            }
+        })
+    })
 });