diff --git a/cve-agency-manager/cve_tracking/core/comment/issue_comment.py b/cve-agency-manager/cve_tracking/core/comment/issue_comment.py index d6c7030d37317a1867a7efcfbd3d25047a5144ec..f5fdfbc467ee0b4b6b6e5302fa4496d305f35430 100644 --- a/cve-agency-manager/cve_tracking/core/comment/issue_comment.py +++ b/cve-agency-manager/cve_tracking/core/comment/issue_comment.py @@ -10,6 +10,8 @@ # PURPOSE. # See the Mulan PSL v2 for more details. # ******************************************************************************/ +import re + from util.gitee_api import Gitee @@ -34,14 +36,16 @@ class Table: def _rowspan(num, platform): return """{}""".format(str(num), platform) - def span_content(self, pr, pr_status, commits): + def span_content(self, pr_url, pr_status, commits): """ Splicing comment content - :param pr: pull request + :param pr_url: pull request url + :param pr_status: pull request status :param commits: commits :return: content spliced """ - contents = self._td(pr) + self._td(pr_status) + self._td("
".join(commits)) + hyperlink_commits = [f"{commit}" for commit in commits] + contents = self._td(pr_url) + self._td(pr_status) + self._td("
".join(hyperlink_commits)) return contents def _table_name(self): @@ -70,6 +74,8 @@ class Table: for platforms in lst: platform_index = 0 platform = platforms.get("platform") + if platform and re.search("bugzilla.redhat.com", platform): + platform = f"https://bugzilla.redhat.com/show_bug.cgi?id={platform.split('/')[-2]}" details = platforms.get("details") rowspan_content = self._rowspan(self._row_span(details), platform)