kallithea Changeset - 22d96f6fd2d1

Changeset - 22d96f6fd2d1

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 10 years ago 2015-09-03 21:43:20
madski@unity3d.com

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.

2 files changed with 3 insertions and 3 deletions:

kallithea/templates/pullrequests/pullrequest_data.html

kallithea/templates/pullrequests/pullrequest_show_all.html

0 comments (0 inline, 0 general)

kallithea/templates/pullrequests/pullrequest_data.html

➞

Show inline comments

@@ @@ -79,14 +79,12 @@ @@
   </table>
 </div>
 %if hasattr(pullrequests, 'pager'):
 <div class="notification-paginator">
   <div class="pagination-wh pagination-left">
   ${pullrequests.pager('$link_previous ~2~ $link_next', **request.GET.mixed())}
   </div>
 </div>
 %endif
 </%def>
 ${pullrequest_overview(c.pullrequests_pager)}

kallithea/templates/pullrequests/pullrequest_show_all.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%namespace name="pullrequest_data" file="pullrequest_data.html"/>
 <%block name="title">
     ${_('%s Pull Requests') % c.repo_name}
 </%block>
 <%def name="breadcrumbs_links()">
 %if c.from_:
     ${_("Pull Requests from %s'") % c.repo_name}
 %else:
     ${_("Pull Requests to '%s'") % c.repo_name}
 %endif
 </%def>
@@ @@ -42,16 +44,16 @@ ${self.repo_context_bar('showpullrequest @@
     </div>
     <div class="normal-indent">
         <div>
         %if c.closed:
             ${h.link_to(_('Hide closed pull requests (only show open pull requests)'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_))}
         %else:
             ${h.link_to(_('Show closed pull requests (in addition to open pull requests)'), h.url('pullrequest_show_all',repo_name=c.repo_name,from_=c.from_,closed=1))}
         %endif
         </div>
     </div>
-    <%include file='pullrequest_data.html'/>
+    ${pullrequest_data.pullrequest_overview(c.pullrequests_pager)}
 </div>
 </%def>

0 comments (0 inline, 0 general)