engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

diffs: add commit id argument and use id of filediff for identifying

Browse source 
collapse blocks and links, this allows render_diffset to be used
multiple times on a page without conflicting with each other
This commit is contained in:
Daniel Dourvaris 2016-10-26 13:13:42 +03:00
parent df7d228bef
commit ec2bf92f43
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rhodecode/templates/codeblocks/diffs.html
View file

@ -23,7 +23,7 @@ new_args.update(kw)
return h.url('', **new_args)
%></%def>
<%def name="render_diffset(diffset,
<%def name="render_diffset(diffset, commit_id=None,
# collapse all file diff entries when there are more than this amount of files in the diff
collapse_when_files_over=20,
@ -122,12 +122,12 @@ collapse_all = len(diffset.files) > collapse_when_files_over
lines_changed = filediff['patch']['stats']['added'] + filediff['patch']['stats']['deleted']
over_lines_changed_limit = lines_changed > lines_changed_limit
%>
<input ${collapse_all and 'checked' or ''} class="diff-collapse-state" id="diff-collapse-${i}" type="checkbox">
<input ${collapse_all and 'checked' or ''} class="diff-collapse-state" id="diff-collapse-${id(filediff)}" type="checkbox">
<div
class="diff"
data-f-path="${filediff['patch']['filename']}"
id="a_${h.FID('', filediff['patch']['filename'])}">
<label for="diff-collapse-${i}" class="diff-heading">
id="a_${h.FID(commit_id or '', filediff['patch']['filename'])}">
<label for="diff-collapse-${id(filediff)}" class="diff-heading">
<div class="diff-collapse-indicator"></div>
${diff_ops(filediff)}
</label>
@ -252,7 +252,7 @@ from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
%endif
</span>
<a class="diff-pill diff-anchor" href="#a_${h.FID('', filediff.patch['filename'])}"></a>
<a class="diff-pill diff-anchor" href="#a_${h.FID(commit_id or '', filediff.patch['filename'])}"></a>
<span class="diff-pill-group" style="float: right">
%if BIN_FILENODE in stats['ops']:
@ -261,12 +261,12 @@ from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
<span class="diff-pill" op="modified">modified</span>
%endif
%endif
%if stats['deleted']:
<span class="diff-pill" op="deleted">-${stats['deleted']}</span>
%endif
%if stats['added']:
<span class="diff-pill" op="added">+${stats['added']}</span>
%endif
%if stats['deleted']:
<span class="diff-pill" op="deleted">-${stats['deleted']}</span>
%endif
</span>
</%def>