Skip to content
Snippets Groups Projects
Commit a89ae094 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

fixes #30

parent b14630f5
No related branches found
No related tags found
No related merge requests found
...@@ -138,10 +138,7 @@ final class DashboardController extends TracToGitlab\Controller ...@@ -138,10 +138,7 @@ final class DashboardController extends TracToGitlab\Controller
}); });
return array_map(function ($issue) { return array_map(function ($issue) {
$mrs = []; $mrs = $this->gitlab->issues()->relatedMergeRequests($this->gitlabProjectId, $issue['iid']);
if ($issue['merge_requests_count'] > 0) {
$mrs = $this->gitlab->issues()->relatedMergeRequests($this->gitlabProjectId, $issue['iid']);
}
return new TracToGitlab\GitlabIssue($issue, $mrs); return new TracToGitlab\GitlabIssue($issue, $mrs);
}, $issues); }, $issues);
} }
......
...@@ -59,10 +59,9 @@ final class GitlabIssue implements \JsonSerializable ...@@ -59,10 +59,9 @@ final class GitlabIssue implements \JsonSerializable
public function isMerged() public function isMerged()
{ {
return $this->hasMergeRequests() return count(array_filter($this->mrs, function ($mr) {
&& count(array_filter($this->mrs, function ($mr) { return $mr['state'] !== 'merged';
return $mr['state'] !== 'merged'; })) === 0;
})) === 0;
} }
public function isBiest() public function isBiest()
...@@ -116,7 +115,7 @@ final class GitlabIssue implements \JsonSerializable ...@@ -116,7 +115,7 @@ final class GitlabIssue implements \JsonSerializable
'assignee' => $this->assignee, 'assignee' => $this->assignee,
'web_url' => $this->web_url, 'web_url' => $this->web_url,
'closed' => $this->isClosed(), 'closed' => $this->isClosed(),
'merge_requests' => $this->issue['merge_requests_count'], 'merge_requests' => count($this->mrs),
'merged' => $this->isMerged(), 'merged' => $this->isMerged(),
'qm_states' => array_combine( 'qm_states' => array_combine(
array_values(self::QM_LABEL_MAPPING), array_values(self::QM_LABEL_MAPPING),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment