# HG changeset patch # User Mads Kiilerich # Date 2015-09-03 21:43:20 # Node ID 22d96f6fd2d1c75b21aeecc1285096a3a2394e37 # Parent 4dfd7a135c04ccfd65d7de443c4fb77f39b6479d pull requests: remove immediate invocation of the function defined in pullrequest_data.html pullrequest_data.html behaved differently when included and when used as namespace. Keep it simple and just let it define the pullrequest_overview function. diff --git a/kallithea/templates/pullrequests/pullrequest_data.html b/kallithea/templates/pullrequests/pullrequest_data.html --- a/kallithea/templates/pullrequests/pullrequest_data.html +++ b/kallithea/templates/pullrequests/pullrequest_data.html @@ -88,5 +88,3 @@ %endif - -${pullrequest_overview(c.pullrequests_pager)} diff --git a/kallithea/templates/pullrequests/pullrequest_show_all.html b/kallithea/templates/pullrequests/pullrequest_show_all.html --- a/kallithea/templates/pullrequests/pullrequest_show_all.html +++ b/kallithea/templates/pullrequests/pullrequest_show_all.html @@ -1,5 +1,7 @@ <%inherit file="/base/base.html"/> +<%namespace name="pullrequest_data" file="pullrequest_data.html"/> + <%block name="title"> ${_('%s Pull Requests') % c.repo_name} @@ -51,7 +53,7 @@ ${self.repo_context_bar('showpullrequest - <%include file='pullrequest_data.html'/> + ${pullrequest_data.pullrequest_overview(c.pullrequests_pager)}