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

pull-requests: show pr version in the my-account and repo pr listing grids.

Browse source
This commit is contained in:
Milka Kuzminski 2020-11-09 16:31:49 +01:00
parent b8ef1f16ea
commit 68ffe48deb
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rhodecode/apps/my_account/views/my_account.py
View file

@ -751,7 +751,8 @@ class MyAccountView(BaseAppView, DataGridAppView):
'title': _render('pullrequest_title', pr.title, pr.description),
'description': h.escape(pr.description),
'updated_on': _render('pullrequest_updated_on',
h.datetime_to_time(pr.updated_on)),
h.datetime_to_time(pr.updated_on),
pr.versions_count),
'updated_on_raw': h.datetime_to_time(pr.updated_on),
'created_on': _render('pullrequest_updated_on',
h.datetime_to_time(pr.created_on)),

3
rhodecode/apps/repository/views/repo_pull_requests.py
View file

@ -121,7 +121,8 @@ class RepoPullRequestsView(RepoAppView, DataGridAppView):
'title': _render('pullrequest_title', pr.title, pr.description),
'description': h.escape(pr.description),
'updated_on': _render('pullrequest_updated_on',
h.datetime_to_time(pr.updated_on)),
h.datetime_to_time(pr.updated_on),
pr.versions_count),
'updated_on_raw': h.datetime_to_time(pr.updated_on),
'created_on': _render('pullrequest_updated_on',
h.datetime_to_time(pr.created_on)),

5
rhodecode/templates/data_table/_dt_elements.mako
View file

@ -397,7 +397,10 @@ ${h.style_metatag(tag_type, tag)|n,trim}
% endif
</%def>
<%def name="pullrequest_updated_on(updated_on)">
<%def name="pullrequest_updated_on(updated_on, pr_version=None)">
% if pr_version:
<code>v${pr_version}</code>
% endif
${h.age_component(h.time_to_utcdatetime(updated_on))}
</%def>