engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pr: adding last updated column to user pull request list, fixes #4162

Browse source
This commit is contained in:
lisaq 2016-08-17 15:48:56 +02:00
parent 2e3256ff49
commit 61df8a609b
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rhodecode/templates/admin/my_account/my_account_pullrequests.html
View file

@ -24,7 +24,7 @@
<th>${_('Author')}</th>
<th></th>
<th>${_('Title')}</th>
<th class="td-time">${_('Opened On')}</th>
<th class="td-time">${_('Last Update')}</th>
<th></th>
</thead>
%for pull_request in c.my_pull_requests:
@ -54,9 +54,8 @@
<br/>${pull_request.description}</div>
</div>
</td>
<td class="td-time">
${h.age_component(pull_request.created_on)}
${h.age_component(pull_request.updated_on)}
</td>
<td class="td-action repolist_actions">
${h.secure_form(url('pullrequest_delete', repo_name=pull_request.target_repo.repo_name, pull_request_id=pull_request.pull_request_id),method='delete')}
@ -89,7 +88,7 @@
<th>${_('Author')}</th>
<th></th>
<th>${_('Title')}</th>
<th class="td-time">${_('Opened On')}</th>
<th class="td-time">${_('Last Update')}</th>
</thead>
%for pull_request in c.participate_in_pull_requests:
<tr class="${'closed' if pull_request.is_closed() else ''} prwrapper">
@ -118,9 +117,8 @@
<br/>${pull_request.description}</div>
</div>
</td>
<td class="td-time">
${h.age_component(pull_request.created_on)}
${h.age_component(pull_request.updated_on)}
</td>
</tr>
%endfor

2
rhodecode/templates/pullrequests/pullrequests.html
View file

@ -105,7 +105,7 @@ $(document).ready(function() {
{ data: {"_": "comments",
"sort": "comments_raw"}, title: "", className: "td-comments", orderable: false},
{ data: {"_": "updated_on",
"sort": "updated_on_raw"}, title: "${_('Updated on')}", className: "td-time" }
"sort": "updated_on_raw"}, title: "${_('Last Update')}", className: "td-time" }
],
language: {
paginate: DEFAULT_GRID_PAGINATION,