diff --git a/module/repo/test/model/savebranchrelation.php b/module/repo/test/model/savebranchrelation.php index 4b2ebbbe15..31639a6bad 100755 --- a/module/repo/test/model/savebranchrelation.php +++ b/module/repo/test/model/savebranchrelation.php @@ -13,15 +13,15 @@ cid=8 - 保存任务和分支的关联关系 - 属性AID @2 - 属性BID @1 - - 属性extra @master + - 属性BType @master - 保存需求和分支的关联关系 - 属性AID @3 - 属性BID @2 - - 属性extra @story + - 属性BType @story - 保存Bug和分支的关联关系 - 属性AID @4 - 属性BID @3 - - 属性extra @bug + - 属性BType @bug */ @@ -31,16 +31,16 @@ $repoID = 1; $branch = 'master'; $objectID = 2; $objectType = 'task'; -r($repo->saveBranchRelationTest($repoID, $branch, $objectID, $objectType)) && p('AID,BID,extra') && e('2,1,master'); //保存任务和分支的关联关系 +r($repo->saveBranchRelationTest($repoID, $branch, $objectID, $objectType)) && p('AID,BID,BType') && e('2,1,master'); //保存任务和分支的关联关系 $repoID = 2; $branch = 'story'; $objectID = 3; $objectType = 'story'; -r($repo->saveBranchRelationTest($repoID, $branch, $objectID, $objectType)) && p('AID,BID,extra') && e('3,2,story'); //保存需求和分支的关联关系 +r($repo->saveBranchRelationTest($repoID, $branch, $objectID, $objectType)) && p('AID,BID,BType') && e('3,2,story'); //保存需求和分支的关联关系 $repoID = 3; $branch = 'bug'; $objectID = 4; $objectType = 'bug'; -r($repo->saveBranchRelationTest($repoID, $branch, $objectID, $objectType)) && p('AID,BID,extra') && e('4,3,bug'); //保存Bug和分支的关联关系 \ No newline at end of file +r($repo->saveBranchRelationTest($repoID, $branch, $objectID, $objectType)) && p('AID,BID,BType') && e('4,3,bug'); //保存Bug和分支的关联关系 \ No newline at end of file diff --git a/module/repo/test/repo.class.php b/module/repo/test/repo.class.php index b40bd59414..3cf99dfdbf 100755 --- a/module/repo/test/repo.class.php +++ b/module/repo/test/repo.class.php @@ -743,7 +743,7 @@ class repoTest ->andWhere('AID')->eq($objectID) ->andWhere('BID')->eq($repoID) ->andWhere('relation')->eq('linkrepobranch') - ->andWhere('BType')->eq('repobranch') + ->andWhere('BType')->eq($branch) ->fetch(); }