diff --git a/module/convert/model.php b/module/convert/model.php index c5b3238752..b4de934a2e 100644 --- a/module/convert/model.php +++ b/module/convert/model.php @@ -854,6 +854,7 @@ EOT; if(strpos($userKey, 'JIRAUSER') !== false) { $userID = str_replace('JIRAUSER', '', $userKey); + if(!isset($users[$userID])) return ''; return $this->processJiraUser($users[$userID]->account, $users[$userID]->email); } else @@ -999,7 +1000,7 @@ EOT; $relations = $jiraRelation ? json_decode($jiraRelation, true) : array(); } - if(!empty($relations["zentaoStatus{$issueType}"][$jiraStatus])) return $relations["zentaoStatus{$issueType}"][$jiraStatus]; + if(!empty($relations["zentaoStatus{$issueType}"][$jiraStatus])) return (string)$relations["zentaoStatus{$issueType}"][$jiraStatus]; if($objectType == 'testcase' && empty($this->config->testcase->needReview)) return 'normal'; if($objectType == 'feedback' && empty($this->config->feedback->needReview)) return 'normal'; diff --git a/module/convert/tao.php b/module/convert/tao.php index 6715aeb92d..64d45504fd 100644 --- a/module/convert/tao.php +++ b/module/convert/tao.php @@ -1039,7 +1039,7 @@ class convertTao extends convertModel $member->days = 0; $member->hours = $this->config->execution->defaultWorkhours; - $this->dao->dbh($this->dbh)->insert(TABLE_TEAM)->data($member)->exec(); + $this->dao->dbh($this->dbh)->replace(TABLE_TEAM)->data($member)->exec(); return true; } @@ -1112,6 +1112,7 @@ class convertTao extends convertModel foreach($projectRoleActor[$data->id] as $userID) { $account = $this->getJiraAccount($userID); + if(!$account) continue; if($account == $project->openedBy) continue; $this->createTeamMember($projectID, $account, 'project'); @@ -1167,6 +1168,7 @@ class convertTao extends convertModel foreach($projectRoleActor[$jiraProjectID] as $userID) { $account = $this->getJiraAccount($userID); + if(!$account) continue; if($account == $execution->openedBy) continue; $this->createTeamMember($executionID, $account, 'execution'); @@ -1231,6 +1233,7 @@ class convertTao extends convertModel foreach($projectRoleActor[$jiraProjectID] as $userID) { $account = $this->getJiraAccount($userID); + if(!$account) continue; if($account == $execution->openedBy) continue; $this->createTeamMember($executionID, $account, 'execution');