Merge branch 'sprint/180_songchenxuan_fix_classicbranchbug' into 'sprint/180'

Sprint/180 songchenxuan fix classicbranchbug

See merge request easycorp/zentaopms!1164
This commit is contained in:
朱金勇
2021-12-29 08:55:59 +00:00
3 changed files with 4 additions and 3 deletions

View File

@@ -559,7 +559,7 @@ class bug extends control
if($user) $productMembers[$assignedTo] = $user->realname;
}
$moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0, $branch === 'all' ? 0 : $branch);
$moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0, ($branch === 'all' or !isset($branches[$branch])) ? 0 : $branch);
if(empty($moduleOptionMenu)) die(js::locate(helper::createLink('tree', 'browse', "productID=$productID&view=story")));
/* Get products and projects. */