From ef163ba72a751a4d539e15e292792e39ec3ec04f Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Thu, 24 Feb 2022 15:58:11 +0100
Subject: [PATCH] show approval
---
controllers/mergerequests.php | 27 ++++++++-------------------
views/mergerequests/index.php | 6 ++++++
2 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/controllers/mergerequests.php b/controllers/mergerequests.php
index 16ab182..9379afc 100644
--- a/controllers/mergerequests.php
+++ b/controllers/mergerequests.php
@@ -54,27 +54,16 @@ final class MergerequestsController extends TracToGitlab\GitlabController
}
return true;
-
-// foreach (['worksforme', 'wontfix', 'Duplicate', 'invalid'] as $label) {
-// if (in_array($label, $issue['labels'])) {
-// return false;
-// }
-// }
-//
-// $has_version = array_reduce($issue['labels'], function ($has_version, $label) {
-// return $has_version || strpos($label, 'Version::') === 0;
-// }, false);
-// return $has_version;
});
-// var_dump($mrs);die;
-//
-// $issues = array_map(function ($issue) {
-// $issue['studip_version'] = $this->extractVersion($issue['labels']);
-// $issue['mr'] = $this->fetchRelatedMergeRequest($issue['iid']);
-// return $issue;
-// }, $issues);
-//
+ $mrs = array_map(function ($mr) {
+ $mr['approvals'] = $this->gitlab->mergeRequests()->approvals(
+ $this->gitlabProjectId,
+ $mr['iid']
+ );
+ return $mr;
+ }, $mrs);
+
usort($mrs, function ($a, $b) {
return strcmp($b['updated_at'], $a['updated_at']);
});
diff --git a/views/mergerequests/index.php b/views/mergerequests/index.php
index b845b08..b6cbb8e 100644
--- a/views/mergerequests/index.php
+++ b/views/mergerequests/index.php
@@ -30,6 +30,12 @@
<a href="<?= htmlReady($mr['web_url']) ?>" target="_blank">
#<?= htmlReady($mr['iid']) ?>:
<?= htmlReady($mr['title']) ?>
+ </a>
+ <? if ($mr['approvals']['approved']): ?>
+ <?= Icon::create('check-circle', Icon::ROLE_STATUS_GREEN)->asImg([
+ 'class' => 'text-bottom',
+ ]) ?>
+ <? endif; ?>
</td>
<td>
<? if ($mr['task_completion_status']['count'] === $mr['task_completion_status']['completed_count']): ?>
--
GitLab