##// END OF EJS Templates
pull-requests: fixed case of unresolved comments attached to removed file in pr....
marcink -
r2808:241bd1e7 default
parent child Browse files
Show More
@@ -263,8 +263,13 b' collapse_all = len(diffset.files) > coll'
263
263
264 ## outdated comments that are made for a file that has been deleted
264 ## outdated comments that are made for a file that has been deleted
265 % for filename, comments_dict in (deleted_files_comments or {}).items():
265 % for filename, comments_dict in (deleted_files_comments or {}).items():
266
266 <%
267 <div class="filediffs filediff-outdated" style="display: none">
267 display_state = 'display: none'
268 open_comments_in_file = [x for x in comments_dict['comments'] if x.outdated is False]
269 if open_comments_in_file:
270 display_state = ''
271 %>
272 <div class="filediffs filediff-outdated" style="${display_state}">
268 <input ${collapse_all and 'checked' or ''} class="filediff-collapse-state" id="filediff-collapse-${id(filename)}" type="checkbox">
273 <input ${collapse_all and 'checked' or ''} class="filediff-collapse-state" id="filediff-collapse-${id(filename)}" type="checkbox">
269 <div class="filediff" data-f-path="${filename}" id="a_${h.FID('', filename)}">
274 <div class="filediff" data-f-path="${filename}" id="a_${h.FID('', filename)}">
270 <label for="filediff-collapse-${id(filename)}" class="filediff-heading">
275 <label for="filediff-collapse-${id(filename)}" class="filediff-heading">
@@ -291,7 +296,7 b' collapse_all = len(diffset.files) > coll'
291
296
292 <td></td>
297 <td></td>
293 <td class="cb-text cb-${op_class(BIN_FILENODE)}" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=5'}>
298 <td class="cb-text cb-${op_class(BIN_FILENODE)}" ${c.diffmode == 'unified' and 'colspan=4' or 'colspan=5'}>
294 ${_('File was deleted in this version, and outdated comments were made on it')}
299 ${_('File was deleted in this version. There are still outdated/unresolved comments attached to it.')}
295 </td>
300 </td>
296 </tr>
301 </tr>
297 %if c.diffmode == 'unified':
302 %if c.diffmode == 'unified':
General Comments 0
You need to be logged in to leave comments. Login now