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

2017-12-19 17:37:04 +08:00
parent b8fa2165ab 6574cecec4
commit f4e2a0db03
2 changed files with 14 additions and 1 deletions
@@ -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] : '';
            }