diff --git a/pagure/templates/user_requests.html b/pagure/templates/user_requests.html index 38a6eff..1515969 100644 --- a/pagure/templates/user_requests.html +++ b/pagure/templates/user_requests.html @@ -11,10 +11,14 @@
- Open - Merged - Closed - All + Open + Merged + Closed + All

@@ -23,78 +27,93 @@ requests|selectattr("user.username", "equalto", username), requests|rejectattr("user.username", "equalto", username)) %} {% if loop.first %} - Opened Pull Requests + {% set id="my-pr-table" %} + + Pull Requests opened by {{ username | avatar(20) | safe }} + {{ username }} + {% else %} - Other Pull Requests + {% set id="pr-table" %} + + Pull Requests {{ username | avatar(20) | safe }} + {{ username }} can act on + {% 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.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
+ + + + + + + + + + + + + + + {% for request in pullrequests %} + + + + + + + + + + {% 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 %} +

{% endfor %} @@ -118,7 +137,27 @@ $(".pr-status").hide(); $("."+$(this).attr("data-togglebutton")).show(); } + showNoResultMessage(); }); }); + + // Show 'No pull-requests found' message. + function showNoResultMessage(){ + // Flush old view... + $('.noresult').hide(); + + // ... and check which should be shown now. + if ($('#pr-table .pr-status').filter(':visible').length == 0){ + $('#pr-table .noresult').show(); + } + if ($('#my-pr-table .pr-status').filter(':visible').length == 0){ + $('#my-pr-table .noresult').show(); + } + } + + // Show 'No pull-requests found' message on pageload. + $(function(){ + showNoResultMessage(); + }); {% endblock %}