Files
@ 9855b31d033b
Branch filter:
Location: kallithea/rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html - annotation
9855b31d033b
2.4 KiB
text/html
pullrequests: fix changesets ordering being reversed when creating new pull requests
41b4edf77b5b tried to make the displayed order of changeset consistent: The
topmost is always the latest.
That did however also reverse the ordering of the changesets sent back in the
post when used in the pull request creation form. Displaying the pull request
later on would reverse it again and thus show it in the 'wrong' order.
We now undo that reversing when creating the pull requests, and the stored data
will thus be the same as before.
41b4edf77b5b tried to make the displayed order of changeset consistent: The
topmost is always the latest.
That did however also reverse the ordering of the changesets sent back in the
post when used in the pull request creation form. Displaying the pull request
later on would reverse it again and thus show it in the 'wrong' order.
We now undo that reversing when creating the pull requests, and the stored data
will thus be the same as before.
7854097b189c 7854097b189c 7854097b189c 7854097b189c 7854097b189c 19daa8d761dc 19daa8d761dc ef7520340c44 ef7520340c44 8a8a559eaf95 74364824c1e1 74364824c1e1 8a8a559eaf95 8a8a559eaf95 8a8a559eaf95 8a8a559eaf95 8a8a559eaf95 8a8a559eaf95 8a8a559eaf95 74364824c1e1 74364824c1e1 74364824c1e1 74364824c1e1 74364824c1e1 74364824c1e1 74364824c1e1 ef7520340c44 ef7520340c44 ef7520340c44 ef7520340c44 ef7520340c44 19daa8d761dc 19daa8d761dc 49a4864b11c1 19daa8d761dc eaa36a2497a9 ef7520340c44 8a8a559eaf95 74364824c1e1 8a8a559eaf95 8a8a559eaf95 8a8a559eaf95 8a8a559eaf95 8a8a559eaf95 8a8a559eaf95 8a8a559eaf95 8a8a559eaf95 ef7520340c44 ef7520340c44 ef7520340c44 ef7520340c44 ef7520340c44 19daa8d761dc | %if c.show_closed:
${h.checkbox('show_closed',checked="checked", label=_('Show closed pull requests'))}
%else:
${h.checkbox('show_closed',label=_('Show closed pull requests'))}
%endif
<div class="pullrequests_section_head">${_('Opened by me')}</div>
<ul>
%if c.my_pull_requests:
%for pull_request in c.my_pull_requests:
<li class="${'closed' if pull_request.is_closed() else ''}">
<div style="height: 12px">
<div style="float:left">
<img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />
<a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">
${_('Pull request #%s opened on %s') % (pull_request.pull_request_id, h.fmt_date(pull_request.created_on))}
%if pull_request.is_closed():
(${_('Closed')})
%endif
</a>
</div>
<div style="float:left;margin-top: -5px">
${h.form(url('pullrequest_delete', repo_name=pull_request.other_repo.repo_name, pull_request_id=pull_request.pull_request_id),method='delete')}
${h.submit('remove_%s' % pull_request.pull_request_id,'',class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this pull request')+"');")}
${h.end_form()}
</div>
</div>
</li>
%endfor
%else:
<li><span class="empty_data">${_('Nothing here yet')}</span></li>
%endif
</ul>
<div class="pullrequests_section_head" style="clear:both">${_('I participate in')}</div>
<ul>
%if c.participate_in_pull_requests:
%for pull_request in c.participate_in_pull_requests:
<li class="${'closed' if pull_request.is_closed() else ''}">
<div style="height: 12px">
<img src="${h.url('/images/icons/flag_status_%s.png' % str(pull_request.last_review_status))}" />
<a href="${h.url('pullrequest_show',repo_name=pull_request.other_repo.repo_name,pull_request_id=pull_request.pull_request_id)}">
${_('Pull request #%s opened by %s on %s') % (pull_request.pull_request_id, pull_request.author.full_name, h.fmt_date(pull_request.created_on))}
</a>
%if pull_request.is_closed():
(${_('Closed')})
%endif
</div>
</li>
%endfor
%else:
<li><span class="empty_data">${_('Nothing here yet')}</span></li>
%endif
</ul>
|