From f8a683677638a506e415795c3e9f13cada150c32 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon
Date: Aug 01 2017 14:19:24 +0000
Subject: Indicate the issue/PR status in the title of its link
Fixes https://pagure.io/pagure/issue/2481
Signed-off-by: Pierre-Yves Chibon
---
diff --git a/pagure/pfmarkdown.py b/pagure/pfmarkdown.py
index 8e791bf..2ed0799 100644
--- a/pagure/pfmarkdown.py
+++ b/pagure/pfmarkdown.py
@@ -376,12 +376,18 @@ def _obj_anchor_tag(user, namespace, repo, obj, text):
if obj.private:
title = 'Private issue'
else:
- title = obj.title
+ if obj.status:
+ title = '[%s] %s' % (obj.status, obj.title)
+ else:
+ title = obj.title
else:
url = flask.url_for(
'request_pull', username=user, namespace=namespace, repo=repo,
requestid=obj.id)
- title = obj.title
+ if obj.status:
+ title = '[%s] %s' % (obj.status, obj.title)
+ else:
+ title = obj.title
element = markdown.util.etree.Element("a")
element.set('href', url)
diff --git a/tests/test_pagure_flask_api_user.py b/tests/test_pagure_flask_api_user.py
index 572eec7..f889a9b 100644
--- a/tests/test_pagure_flask_api_user.py
+++ b/tests/test_pagure_flask_api_user.py
@@ -32,6 +32,8 @@ import tests
class PagureFlaskApiUSertests(tests.Modeltests):
""" Tests for the flask API of pagure for issue """
+ maxDiff = None
+
def setUp(self):
""" Set up the environnment, ran before every tests. """
super(PagureFlaskApiUSertests, self).setUp()
@@ -368,7 +370,7 @@ class PagureFlaskApiUSertests(tests.Modeltests):
"date": date,
"date_created": "1477558752",
"type": "pull-request",
- "description_mk": "pingou created PR test#1
",
+ "description_mk": "pingou created PR test#1
",
"id": 1,
"ref_id": "1",
"type": "created",
@@ -381,7 +383,7 @@ class PagureFlaskApiUSertests(tests.Modeltests):
"date": date,
"date_created": "1477558752",
"type": "pull-request",
- "description_mk": "pingou commented on PR test#1
",
+ "description_mk": "pingou commented on PR test#1
",
"id": 2,
"ref_id": "1",
"type": "commented",
@@ -394,7 +396,7 @@ class PagureFlaskApiUSertests(tests.Modeltests):
"date": date,
"date_created": "1477558752",
"type": "pull-request",
- "description_mk": "pingou closed PR test#1
",
+ "description_mk": "pingou closed PR test#1
",
"id": 3,
"ref_id": "1",
"type": "closed",
@@ -407,7 +409,7 @@ class PagureFlaskApiUSertests(tests.Modeltests):
"date": date,
"date_created": "1477558752",
"type": "pull-request",
- "description_mk": "pingou commented on PR test#1
",
+ "description_mk": "pingou commented on PR test#1
",
"id": 4,
"ref_id": "1",
"type": "commented",
diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py
index 3b734b1..43b41c5 100644
--- a/tests/test_pagure_lib.py
+++ b/tests/test_pagure_lib.py
@@ -4206,33 +4206,33 @@ class PagureLibtests(tests.Modeltests):
expected = [
# 'foo bar test#1 see?',
'foo bar test#1 see?
',
+ ' title="[Open] test pull-request">test#1 see?
',
# 'foo bar pingou/test#2 I mean, really', -- unknown namespace
'foo bar pingou/test#2 I mean, really
',
# 'foo bar fork/pingou/test#2 bouza!',
'foo bar '
+ 'pingou/test/pull-request/2" title="[Open] test pull-request in fork">'
'pingou/test#2 bouza!
',
# 'foo bar forks/pingou/test#2 bouza!', -- the 's' doesn't matter
'foo bar '
+ 'pingou/test/pull-request/2" title="[Open] test pull-request in fork">'
'pingou/test#2 bouza!
',
# 'foo bar ns/test3#4 bouza!',
'foo bar ns/test3#4 bouza!
',
+ ' title="[Open] test issue">ns/test3#4 bouza!',
# 'foo bar fork/user/ns/test#5 bouza!', -- unknown fork
'foo bar user/ns/test#5 bouza!
',
# 'foo bar fork/pingou/ns/test#7 bouza!',
'foo bar '
+ 'fork/pingou/ns/test/issue/7" title="[Open] test issue #7">'
'pingou/ns/test#7 bouza!
',
# 'test#1 bazinga!',
'test#1 bazinga!
',
+ 'title="[Open] test pull-request">test#1 bazinga!',
# 'pingou opened the PR forks/pingou/test#2'
'pingou opened the PR pingou/test#2
',
+ 'title="[Open] test pull-request in fork">pingou/test#2',
# 'fork/pingou/ns/test#8 is private',
'pingou/ns/test#8 is private
',