# HG changeset patch # User Milka Kuzminski # Date 2020-11-09 15:31:49 # Node ID 5a275c9fd549a27e079815dfce5edcefe693f9be # Parent e8115e8a96a757d408154f823bcaaab8653ebe89 pull-requests: show pr version in the my-account and repo pr listing grids. diff --git a/rhodecode/apps/my_account/views/my_account.py b/rhodecode/apps/my_account/views/my_account.py --- a/rhodecode/apps/my_account/views/my_account.py +++ b/rhodecode/apps/my_account/views/my_account.py @@ -751,7 +751,8 @@ class MyAccountView(BaseAppView, DataGri '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)), diff --git a/rhodecode/apps/repository/views/repo_pull_requests.py b/rhodecode/apps/repository/views/repo_pull_requests.py --- a/rhodecode/apps/repository/views/repo_pull_requests.py +++ b/rhodecode/apps/repository/views/repo_pull_requests.py @@ -121,7 +121,8 @@ class RepoPullRequestsView(RepoAppView, '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)), diff --git a/rhodecode/templates/data_table/_dt_elements.mako b/rhodecode/templates/data_table/_dt_elements.mako --- a/rhodecode/templates/data_table/_dt_elements.mako +++ b/rhodecode/templates/data_table/_dt_elements.mako @@ -397,7 +397,10 @@ % endif -<%def name="pullrequest_updated_on(updated_on)"> +<%def name="pullrequest_updated_on(updated_on, pr_version=None)"> + % if pr_version: + v${pr_version} + % endif ${h.age_component(h.time_to_utcdatetime(updated_on))}