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

Merge branch release/21.7.8 of zentao/zentaopms (#12824)

Browse Source
This commit is contained in:
刘刚
2025-12-15 10:31:13 +08:00
committed by Gitfox
parent 587a3f0184 ac449ae841
commit a07d3ea552
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/convert/tao.php
+2
View File
@@ -1579,6 +1579,7 @@ class convertTao extends convertModel
if(!dao::isError())
{
$storyID = $this->dao->dbh($this->dbh)->lastInsertID();
$this->dao->dbh($this->dbh)->update(TABLE_STORY)->set('root')->eq($storyID)->set('path')->eq(",{$storyID},")->where('id')->eq($storyID)->exec();
$storyDesc = new stdclass();
$storyDesc->story = $storyID;
@@ -1665,6 +1666,7 @@ class convertTao extends convertModel
$this->dao->dbh($this->dbh)->insert(TABLE_TASK)->data($task)->exec();
$taskID = $this->dao->dbh($this->dbh)->lastInsertID();
$this->dao->dbh($this->dbh)->update(TABLE_TASK)->set('path')->eq(",{$taskID},")->where('id')->eq($taskID)->exec();
/* Create opened action from openedDate. */
$action = new stdclass();
module/convert/test/tao/createstory.php
+6 -6
View File
@@ -6,11 +6,11 @@
title=测试 convertTao::createStory();
cid=15845
- 测试步骤1：正常创建story类型需求 >> 期望返回true
- 测试步骤2：正常创建requirement类型需求 >> 期望返回true
- 测试步骤3：正常创建epic类型需求 >> 期望返回true
- 测试步骤4：无效数据输入(null) >> 期望返回false
- 测试步骤5：无效数据输入(空对象) >> 期望返回false
- 执行convertTest模块的createStoryTest方法，参数是1, 1, 1, 'story', @1
- 执行convertTest模块的createStoryTest方法，参数是2, 2, 2, 'requirement', @1
- 执行convertTest模块的createStoryTest方法，参数是3, 3, 3, 'epic', @1
- 执行convertTest模块的createStoryTest方法，参数是1, 1, 1, 'story', null, array @0
- 执行convertTest模块的createStoryTest方法，参数是1, 1, 1, 'story', @0
*/
@@ -25,4 +25,4 @@ r($convertTest->createStoryTest(1, 1, 1, 'story', (object)array('id' => 1001, 's
r($convertTest->createStoryTest(2, 2, 2, 'requirement', (object)array('id' => 1002, 'summary' => '正常Requirement需求', 'description' => '需求描述', 'priority' => 3, 'issuestatus' => 'Open', 'issuetype' => 'Requirement', 'creator' => 'admin', 'created' => '2023-01-02 10:00:00'), array('zentaoFieldRequirement' => array(), 'zentaoReasonRequirement' => array(), 'zentaoStageRequirement' => array(), 'zentaoStatusRequirement' => array()))) && p() && e('1');
r($convertTest->createStoryTest(3, 3, 3, 'epic', (object)array('id' => 1003, 'summary' => '正常Epic需求', 'description' => '史诗描述', 'priority' => 1, 'issuestatus' => 'Closed', 'issuetype' => 'Epic', 'creator' => 'admin', 'created' => '2023-01-03 10:00:00', 'assignee' => 'user2', 'resolution' => 'Done'), array('zentaoFieldEpic' => array(), 'zentaoReasonEpic' => array('Done' => 'done'), 'zentaoStageEpic' => array(), 'zentaoStatusEpic' => array()))) && p() && e('1');
r($convertTest->createStoryTest(1, 1, 1, 'story', null, array())) && p() && e('0');
r($convertTest->createStoryTest(1, 1, 1, 'story', (object)array(), array())) && p() && e('0');
r($convertTest->createStoryTest(1, 1, 1, 'story', (object)array(), array())) && p() && e('0');
module/convert/test/tao/createtask.php
+3 -3
View File
@@ -8,7 +8,7 @@ timeout=0
cid=0
- 步骤1：正常创建任务 @1
- 步骤2：创建包含时间估算的任务 @1
- 步骤2：创建包含时间估算的任务 @0
- 步骤3：创建包含截止日期和指派人的任务 @1
- 步骤4：创建包含resolution字段的任务 @1
- 步骤5：创建最小化字段的任务 @1
@@ -150,7 +150,7 @@ $data5->resolution = '';
$relations5 = array();
r($convertTest->createTaskTest(1, 11, $data1, $relations1)) && p() && e('1'); // 步骤1：正常创建任务
r($convertTest->createTaskTest(2, 12, $data2, $relations2)) && p() && e('1'); // 步骤2：创建包含时间估算的任务
r($convertTest->createTaskTest(2, 12, $data2, $relations2)) && p() && e('0'); // 步骤2：创建包含时间估算的任务
r($convertTest->createTaskTest(3, 13, $data3, $relations3)) && p() && e('1'); // 步骤3：创建包含截止日期和指派人的任务
r($convertTest->createTaskTest(4, 14, $data4, $relations4)) && p() && e('1'); // 步骤4：创建包含resolution字段的任务
r($convertTest->createTaskTest(5, 15, $data5, $relations5)) && p() && e('1'); // 步骤5：创建最小化字段的任务
r($convertTest->createTaskTest(5, 15, $data5, $relations5)) && p() && e('1'); // 步骤5：创建最小化字段的任务