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

* [bug#60484,done,1h,0h] Fix import jira build error.

Browse Source
This commit is contained in:
wangyuting
2025-03-18 10:32:11 +08:00
committed by 谢杞钰
parent 05222859f2
commit ef552d772b
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/convert/config.php
+3 -3
View File
@@ -156,7 +156,7 @@ $config->convert->importDeafaultValue['bug']['resolution']["Declined"] =
$config->convert->importDeafaultValue['bug']['resolution']['完成'] = 'fixed';
$config->convert->importDeafaultValue['bug']['resolution']["被否决"] = 'willnotfix';
$config->convert->importDeafaultValue['bug']['resolution']["重复提交"] = 'duplicate';
$config->convert->importDeafaultValue['bug']['resolution']["无法再次重现"] = 'notrepro';
$config->convert->importDeafaultValue['bug']['resolution']["无法再次复现"] = 'notrepro';
$config->convert->importDeafaultValue['bug']['resolution']["被拒绝"] = 'willnotfix';
$config->convert->importDeafaultValue['task']['reason']['Done'] = 'done';
@@ -167,7 +167,7 @@ $config->convert->importDeafaultValue['task']['reason']["Declined"] = 'c
$config->convert->importDeafaultValue['task']['reason']['完成'] = 'done';
$config->convert->importDeafaultValue['task']['reason']["被否决"] = 'cancel';
$config->convert->importDeafaultValue['task']['reason']["重复提交"] = 'cancel';
$config->convert->importDeafaultValue['task']['reason']["无法再次重现"] = 'cancel';
$config->convert->importDeafaultValue['task']['reason']["无法再次复现"] = 'cancel';
$config->convert->importDeafaultValue['task']['reason']["被拒绝"] = 'cancel';
$config->convert->importDeafaultValue['story']['reason']['Done'] = 'done';
@@ -178,7 +178,7 @@ $config->convert->importDeafaultValue['story']['reason']["Declined"] = '
$config->convert->importDeafaultValue['story']['reason']['完成'] = 'done';
$config->convert->importDeafaultValue['story']['reason']["被否决"] = 'willnotdo';
$config->convert->importDeafaultValue['story']['reason']["重复提交"] = 'duplicate';
$config->convert->importDeafaultValue['story']['reason']["无法再次重现"] = 'bydesign';
$config->convert->importDeafaultValue['story']['reason']["无法再次复现"] = 'bydesign';
$config->convert->importDeafaultValue['story']['reason']["被拒绝"] = 'cancel';
$config->convert->importDeafaultValue['requirement'] = $config->convert->importDeafaultValue['story'];
module/convert/tao.php
+6 -1
View File
@@ -171,6 +171,7 @@ class convertTao extends convertModel
$build->startdate = isset($data['startdate']) ? $data['startdate'] : null;
$build->releasedate = isset($data['releasedate']) ? $data['releasedate'] : '';
$build->released = isset($data['released']) ? $data['released'] : '';
$build->archived = isset($data['archived']) ? $data['archived'] : false;
$build->description = isset($data['description']) ? $data['description'] : '';
return $build;
@@ -1907,6 +1908,10 @@ class convertTao extends convertModel
*/
protected function createRelease(object $build, object $data, array $releaseIssue, array $issueList): bool
{
$status = 'normal';
if(empty($data->released)) $status = 'wait';
if(!empty($data->archived)) $status = 'terminate';
/* Create release. */
$release = new stdclass();
$release->product = $build->product;
@@ -1916,7 +1921,7 @@ class convertTao extends convertModel
$release->name = $build->name;
$release->date = helper::isZeroDate($data->startdate) ? NULL : substr($data->startdate, 0, 10);
$release->desc = isset($data->description) ? $data->description : '';
$release->status = empty($data->released) ? 'wait' : 'normal';
$release->status = $status;
$release->releasedDate = !empty($data->released) ? substr($data->releasedate, 0, 10) : null;
$release->createdBy = $this->app->user->account;
$release->createdDate = helper::now();