# HG changeset patch # User Jan Heylen # Date 1451732136 -3600 # Node ID 150431aae9ba1a5e840b95826dd7661a6b2fc02c # Parent a1a517ebf550b8c3db04126577bdc558ed7f859c diff: move looping over files into diff_block_simple Make it slightly more like regular diff_block and make the next changes possible. diff -r a1a517ebf550 -r 150431aae9ba kallithea/templates/changeset/diff_block.html --- a/kallithea/templates/changeset/diff_block.html Sat Jan 02 10:58:06 2016 +0100 +++ b/kallithea/templates/changeset/diff_block.html Sat Jan 02 11:55:36 2016 +0100 @@ -65,9 +65,11 @@ -<%def name="diff_block_simple(change)"> - - %for op,filenode_path,diff in change: +<%def name="diff_block_simple(files, changes)"> + %for fid, ch, f, stat in files: + <% + op, filenode_path, diff = changes[fid] + %>
diff -r a1a517ebf550 -r 150431aae9ba kallithea/templates/compare/compare_diff.html --- a/kallithea/templates/compare/compare_diff.html Sat Jan 02 10:58:06 2016 +0100 +++ b/kallithea/templates/compare/compare_diff.html Sat Jan 02 11:55:36 2016 +0100 @@ -88,9 +88,7 @@ ## diff block <%namespace name="diff_block" file="/changeset/diff_block.html"/> ${diff_block.diff_block_js()} - %for fid, change, f, stat in c.files: - ${diff_block.diff_block_simple([c.changes[fid]])} - %endfor + ${diff_block.diff_block_simple(c.files, c.changes)} % if c.limited_diff:

${_('Changeset was too big and was cut off...')} ${_('Show full diff')}

% endif diff -r a1a517ebf550 -r 150431aae9ba kallithea/templates/pullrequests/pullrequest_show.html --- a/kallithea/templates/pullrequests/pullrequest_show.html Sat Jan 02 10:58:06 2016 +0100 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Sat Jan 02 11:55:36 2016 +0100 @@ -356,9 +356,7 @@
<%namespace name="diff_block" file="/changeset/diff_block.html"/> ${diff_block.diff_block_js()} - %for fid, change, f, stat in c.files: - ${diff_block.diff_block_simple([c.changes[fid]])} - %endfor + ${diff_block.diff_block_simple(c.files, c.changes)} % if c.limited_diff:

${_('Changeset was too big and was cut off...')} ${_('Show full diff anyway')}

% endif