From ec34d7fd29048b49f59dff2fb302c987e29373e3 Mon Sep 17 00:00:00 2001
From: T'rahk Rokym <trahk.rokym@gmail.com>
Date: Mon, 21 Apr 2025 12:35:03 +0200
Subject: [PATCH] Properly translates GitHub attributes to GitLab

---
 .../templates/allianceauth/admin-status/overview.html    | 2 +-
 allianceauth/templatetags/admin_status.py                | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/allianceauth/templates/allianceauth/admin-status/overview.html b/allianceauth/templates/allianceauth/admin-status/overview.html
index eff882d3..2c8e685f 100644
--- a/allianceauth/templates/allianceauth/admin-status/overview.html
+++ b/allianceauth/templates/allianceauth/admin-status/overview.html
@@ -63,7 +63,7 @@
                                     <span class="badge bg-danger me-2">{% translate "Closed" %}</span>
                                 {% endif %}
                                 <span class="badge bg-info me-2">{{ notif.app_name }}</span>
-                                <a href="{{ notif.web_url }}{{ notif.html_url }}" target="_blank">#{{ notif.iid }}{{ notif.number }} {{ notif.title }}</a>
+                                <a href="{{ notif.web_url }}" target="_blank">#{{ notif.iid }} {{ notif.title }}</a>
                             </li>
                         {% endfor %}
                     </ul>
diff --git a/allianceauth/templatetags/admin_status.py b/allianceauth/templatetags/admin_status.py
index 989a820e..ca055345 100644
--- a/allianceauth/templatetags/admin_status.py
+++ b/allianceauth/templatetags/admin_status.py
@@ -78,7 +78,14 @@ class AppAnnouncementHook:
             f"https://api.github.com/repos/{self.repository_namespace}/issues"
             f"?labels={self.label}&state=all"
         )
-        return [element for element in raw_list if not element.get("pull_request")]
+        # Translates GitHub attributes to GitLab and filters out pull requests
+        clean_list = []
+        for element in raw_list:
+            if not element.get("pull_request"):
+                element["web_url"] = element["html_url"]
+                element["iid"] = element["number"]
+                clean_list.append(element)
+        return clean_list
 
     def _get_gitlab_announcement_list(self) -> list:
         """Return the issues list for a GitLab repository"""