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

diffs: improve text on unresolved comments attached to files that no longer exist in the review.

Browse source 
- fixes #5615
This commit is contained in:
Daniel Dourvaris 2020-04-22 12:38:46 +02:00
parent e3169ab897
commit 23f9dd8816
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rhodecode/templates/codeblocks/diffs.mako
View file

@ -394,11 +394,17 @@ return '%s_%s_%i' % (h.md5_safe(commit+filename), type, line)
</span>
<span class="pill-group pull-left" >
## file op, doesn't need translation
<span class="pill" op="removed">removed in this version</span>
<span class="pill" op="removed">unresolved comments</span>
</span>
<a class="pill filediff-anchor" href="#a_${h.FID(fid, filename)}">¶</a>
<span class="pill-group pull-right">
<span class="pill" op="deleted">-${comments_dict['stats']}</span>
<span class="pill" op="deleted">
% if comments_dict['stats'] >0:
-${comments_dict['stats']}
% else:
${comments_dict['stats']}
% endif
</span>
</span>
</label>
@ -410,7 +416,8 @@ return '%s_%s_%i' % (h.md5_safe(commit+filename), type, line)
<td></td>
<td class="cb-text cb-${op_class(BIN_FILENODE)}" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=5')}>
${_('File was deleted in this version. There are still outdated/unresolved comments attached to it.')}
<strong>${_('This file was removed from diff during updates to this pull-request.')}</strong><br/>
${_('There are still outdated/unresolved comments attached to it.')}
</td>
</tr>
%if c.user_session_attrs["diffmode"] == 'unified':