diff --git a/pagure/templates/user_requests.html b/pagure/templates/user_requests.html index 18f31c3..b0b7193 100644 --- a/pagure/templates/user_requests.html +++ b/pagure/templates/user_requests.html @@ -19,149 +19,84 @@
- Opened Pull Requests - - - - - - - - - - - - - - - - {% for request in requests|selectattr("user.username", "equalto", username) %} - - - - + + + + {% else %} + + + + {% endfor %} + +
#StatusTitleOpenedProjectOpened byAssigned to
PR#{{ request.id }}{{request.status}} - Opened Pull Requests + {% else %} + Other Pull Requests + {% endif %} + + + + + + + + + + + + + + + + {% for request in pullrequests %} + + + + + + - - - - - - {% else %} - - - - {% endfor %} - -
#StatusTitleOpenedProjectOpened byAssigned to
PR#{{ request.id }}{{request.status}} + + {{ request.title | noJS("img") | safe }} + + + {{ + request.date_created | humanize}} + + - {{ request.title | noJS("img") | safe }} - - - {{ - request.date_created | humanize}} - - - {{ request.project.user.username + '/' if request.project.is_fork }} - {{ request.project.namespace + '/' if request.project.namespace }} - {{ request.project.name }} - - - {{ request.user.default_email | avatar(16) | safe }} - {{ request.user.username }} - - {% if request.assignee %} - {{ request.assignee.default_email | avatar(16) | safe }} - {{ request.assignee.user }} - {% else %} - unassigned - {% endif %} -
No pull-request found
-
- - Other Pull Requests - - - - - - - - - - - - - - - - {% for request in requests|rejectattr("user.username", "equalto", username) %} - - - - - - - - - - {% else %} - - - - {% endfor %} - -
#StatusTitleOpenedProjectOpened byAssigned to
PR#{{ request.id }}{{request.status}} - - {{ request.title | noJS("img") | safe }} - - - {{ - request.date_created | humanize}} - - - {{ request.project.user.username + '/' if request.project.is_fork }} - {{ request.project.namespace + '/' if request.project.namespace }} - {{ request.project.name }} - - - {{ request.user.default_email | avatar(16) | safe }} - {{ request.user.username }} - - {% if request.assignee %} - {{ request.assignee.default_email | avatar(16) | safe }} - {{ request.assignee.user }} - {% else %} - unassigned - {% endif %} -
No pull-request found
- + namespace=request.project.namespace) }}"> + {{ request.project.user.username + '/' if request.project.is_fork }} + {{ request.project.namespace + '/' if request.project.namespace }} + {{ request.project.name }} +
+
+ {{ request.user.default_email | avatar(16) | safe }} + {{ request.user.username }} + + {% if request.assignee %} + {{ request.assignee.default_email | avatar(16) | safe }} + {{ request.assignee.user }} + {% else %} + unassigned + {% endif %} +
No pull-request found
+ {% endfor %}