diff --git a/pagure/templates/requests.html b/pagure/templates/requests.html
index 039d2e2..d8673b3 100644
--- a/pagure/templates/requests.html
+++ b/pagure/templates/requests.html
@@ -22,6 +22,13 @@
repo=repo.name) }}">
({{ oth_requests }} Open)
{% endif %}
+
+
@@ -31,6 +38,10 @@
| Title |
Opened by |
Opened on |
+
+ Assigned to (reset)
+ |
@@ -40,21 +51,36 @@
| #{{ request.id }} |
-
- {{ request.title }}
-
+
+ {{ request.title }}
+
|
-
- {{ request.user.user | avatar(16) | safe }}
- {{ request.user.user }}
-
+
+ {{ request.user.user | avatar(16) | safe }}
+ {{ request.user.user }}
+
|
{{ request.date_created.strftime('%Y-%m-%d %H:%M') }}
|
-
+
+ {% if request.assignee %}
+
+ {{ request.assignee.user | avatar(16) | safe }}
+ {{ request.assignee.user }}
+
+ {% else %}
+ (unassigned)
+ {% endif %}
|
{% else %}
diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py
index ec79394..d517263 100644
--- a/pagure/ui/fork.py
+++ b/pagure/ui/fork.py
@@ -45,6 +45,8 @@ def request_pulls(repo, username=None):
""" Request pulling the changes from the fork into the project.
"""
status = flask.request.args.get('status', True)
+ assignee = flask.request.args.get('assignee', None)
+ author = flask.request.args.get('author', None)
repo = pagure.lib.get_project(SESSION, repo, user=username)
@@ -56,14 +58,32 @@ def request_pulls(repo, username=None):
if status is False or str(status).lower() == 'closed':
requests = pagure.lib.search_pull_requests(
- SESSION, project_id=repo.id, status=False)
+ SESSION,
+ project_id=repo.id,
+ status=False,
+ assignee=assignee,
+ author=author)
oth_requests = pagure.lib.search_pull_requests(
- SESSION, project_id=repo.id, status=True, count=True)
+ SESSION,
+ project_id=repo.id,
+ status=True,
+ assignee=assignee,
+ author=author,
+ count=True)
else:
requests = pagure.lib.search_pull_requests(
- SESSION, project_id=repo.id, status=status)
+ SESSION,
+ project_id=repo.id,
+ assignee=assignee,
+ author=author,
+ status=status)
oth_requests = pagure.lib.search_pull_requests(
- SESSION, project_id=repo.id, status=False, count=True)
+ SESSION,
+ project_id=repo.id,
+ status=False,
+ assignee=assignee,
+ author=author,
+ count=True)
return flask.render_template(
'requests.html',
@@ -73,6 +93,8 @@ def request_pulls(repo, username=None):
requests=requests,
oth_requests=oth_requests,
status=status,
+ assignee=assignee,
+ author=author,
)