Files
@ 5d1d25c1c700
Branch filter:
Location: kallithea/rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html - annotation
5d1d25c1c700
1.7 KiB
text/html
set the status of changesets initially on pull request, and make sure we care of version collisions.
Fixes issues #690 and #587
Fixes issues #690 and #587
19daa8d761dc 19daa8d761dc 19daa8d761dc ef7520340c44 ef7520340c44 ef7520340c44 74364824c1e1 74364824c1e1 74364824c1e1 74364824c1e1 74364824c1e1 74364824c1e1 74364824c1e1 74364824c1e1 74364824c1e1 74364824c1e1 74364824c1e1 74364824c1e1 ef7520340c44 ef7520340c44 ef7520340c44 ef7520340c44 ef7520340c44 19daa8d761dc 19daa8d761dc 49a4864b11c1 19daa8d761dc eaa36a2497a9 ef7520340c44 ef7520340c44 74364824c1e1 74364824c1e1 74364824c1e1 74364824c1e1 74364824c1e1 ef7520340c44 ef7520340c44 ef7520340c44 ef7520340c44 ef7520340c44 19daa8d761dc |
<div class="pullrequests_section_head">${_('Opened by me')}</div>
<ul>
%if c.my_pull_requests:
%for pull_request in c.my_pull_requests:
<li>
<div style="height: 12px">
<div style="float:left">
<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))}
</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>
<div style="height: 12px">
<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>
</div>
</li>
%endfor
%else:
<li><span class="empty_data">${_('Nothing here yet')}</span></li>
%endif
</ul>
|