Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master_xieqiyu_fixbug' into 'master'

Browse Source 
* Fix bug of create project when select all branch.

See merge request easycorp/zentaopms!4470
This commit is contained in:
王怡栋
2022-07-12 07:00:55 +00:00
parent 39d3d083ad 74f38571af
commit 1aa2f24efc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/branch/control.php
+1 -1
View File
@@ -274,7 +274,7 @@ class branch extends control
{
$branchTagOption[$branchInfo->id] = $branchInfo->name . ($branchInfo->status == 'closed' ? ' (' . $this->lang->branch->statusList['closed'] . ')' : '');
}
if(!isset($branchTagOption[$oldBranch]))
if(is_numeric($oldBranch) and !isset($branchTagOption[$oldBranch]))
{
$branch = $this->branch->getById($oldBranch, $productID, '');
$branchTagOption[$oldBranch] = $oldBranch == BRANCH_MAIN ? $branch : ($branch->name . ($branch->status == 'closed' ? ' (' . $this->lang->branch->statusList['closed'] . ')' : ''));