Mercurial > kallithea
changeset 5463:22d96f6fd2d1
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.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 03 Sep 2015 21:43:20 +0200 |
| parents | 4dfd7a135c04 |
| children | dde94c758087 |
| files | kallithea/templates/pullrequests/pullrequest_data.html kallithea/templates/pullrequests/pullrequest_show_all.html |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/templates/pullrequests/pullrequest_data.html Thu Sep 03 21:43:20 2015 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_data.html Thu Sep 03 21:43:20 2015 +0200 @@ -88,5 +88,3 @@ %endif </%def> - -${pullrequest_overview(c.pullrequests_pager)}
--- a/kallithea/templates/pullrequests/pullrequest_show_all.html Thu Sep 03 21:43:20 2015 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show_all.html Thu Sep 03 21:43:20 2015 +0200 @@ -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} </%block> @@ -51,7 +53,7 @@ </div> </div> - <%include file='pullrequest_data.html'/> + ${pullrequest_data.pullrequest_overview(c.pullrequests_pager)} </div> </%def>