##// END OF EJS Templates
tests: made few tests for comment edits more stable.
tests: made few tests for comment edits more stable.

File last commit:

r4409:58906467 default
r4410:c028d607 default
Show More
changeset_file_comment.mako
480 lines | 21.6 KiB | application/x-mako | MakoHtmlLexer
/ rhodecode / templates / changeset / changeset_file_comment.mako
templating: use .mako as extensions for template files.
r1282 ## -*- coding: utf-8 -*-
## usage:
## <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
## ${comment.comment_block(comment)}
##
comments: edit functionality added
r4401
<%!
from rhodecode.lib import html_filters
%>
templating: use .mako as extensions for template files.
r1282 <%namespace name="base" file="/base/base.mako"/>
issue-tracker: cache active patterns in the template so we can re-use them when rendering comments....
r4202 <%def name="comment_block(comment, inline=False, active_pattern_entries=None)">
comments: properly show version of pull request into added comments....
r1286 <% pr_index_ver = comment.get_index_version(getattr(c, 'versions', [])) %>
pull-requests: show more info about version of comment vs latest version.
r2809 <% latest_ver = len(getattr(c, 'versions', [])) %>
comments: use unified aggregation of comments counters....
r1332 % if inline:
<% outdated_at_ver = comment.outdated_at_version(getattr(c, 'at_version_num', None)) %>
% else:
<% outdated_at_ver = comment.older_than_version(getattr(c, 'at_version_num', None)) %>
% endif
templating: use .mako as extensions for template files.
r1282 <div class="comment
comments: properly show version of pull request into added comments....
r1286 ${'comment-inline' if inline else 'comment-general'}
templating: use .mako as extensions for template files.
r1282 ${'comment-outdated' if outdated_at_ver else 'comment-current'}"
id="comment-${comment.comment_id}"
line="${comment.line_no}"
data-comment-id="${comment.comment_id}"
comments: allow submitting id of comment which submitted comment resolved....
r1325 data-comment-type="${comment.comment_type}"
comments: edit functionality added
r4401 data-comment-renderer="${comment.renderer}"
data-comment-text="${comment.text | html_filters.base64,n}"
comments: allow to properly initialize outdated comments that are attached...
r2250 data-comment-line-no="${comment.line_no}"
comments: allow submitting id of comment which submitted comment resolved....
r1325 data-comment-inline=${h.json.dumps(inline)}
templating: use .mako as extensions for template files.
r1282 style="${'display: none;' if outdated_at_ver else ''}">
<div class="meta">
comments: allow submitting id of comment which submitted comment resolved....
r1325 <div class="comment-type-label">
comments: ensure we ALWAYS display unmatched comments.
r3080 <div class="comment-label ${comment.comment_type or 'note'}" id="comment-label-${comment.comment_id}" title="line: ${comment.line_no}">
comments: allow submitting id of comment which submitted comment resolved....
r1325 % if comment.comment_type == 'todo':
% if comment.resolved:
<div class="resolved tooltip" title="${_('Resolved by comment #{}').format(comment.resolved.comment_id)}">
<a href="#comment-${comment.resolved.comment_id}">${comment.comment_type}</a>
</div>
% else:
<div class="resolved tooltip" style="display: none">
<span>${comment.comment_type}</span>
</div>
<div class="resolve tooltip" onclick="return Rhodecode.comments.createResolutionComment(${comment.comment_id});" title="${_('Click to resolve this comment')}">
${comment.comment_type}
</div>
% endif
% else:
% if comment.resolved_comment:
fix
comments: re-implemented diff and comments/todos in pull-requests.
r3884 <a href="#comment-${comment.resolved_comment.comment_id}" onclick="Rhodecode.comments.scrollToComment($('#comment-${comment.resolved_comment.comment_id}'), 0, ${h.json.dumps(comment.resolved_comment.outdated)})">
<span style="text-decoration: line-through">#${comment.resolved_comment.comment_id}</span>
</a>
comments: allow submitting id of comment which submitted comment resolved....
r1325 % else:
${comment.comment_type or 'note'}
% endif
% endif
comments: add comments type into comments.
r1324 </div>
</div>
comments: properly show version of pull request into added comments....
r1286 <div class="author ${'author-inline' if inline else 'author-general'}">
hovercacrds: added new tooltips and hovercards to expose certain information for objects shown in UI
r4026 ${base.gravatar_with_user(comment.author.email, 16, tooltip=True)}
comments: cleanup of PR versions/author tags.
r4409
% if comment.pull_request and comment.pull_request.author.user_id == comment.author.user_id:
<span class="tag authortag tooltip" title="${_('Pull request author')}">
${_('author')}
</span>
% endif
templating: use .mako as extensions for template files.
r1282 </div>
<div class="date">
${h.age_component(comment.modified_at, time_is_local=True)}
</div>
comment-history: fixes/ui changes...
r4408 <%
comment_version_selector = 'comment_versions_{}'.format(comment.comment_id)
%>
comments: edit functionality added
r4401 % if comment.history:
<div class="date">
comment-history: fixes/ui changes...
r4408
<input id="${comment_version_selector}" name="${comment_version_selector}"
type="hidden"
data-last-version="${comment.history[-1].version}">
<script type="text/javascript">
comment-history: UI fixes
r4404
comment-history: fixes/ui changes...
r4408 var preLoadVersionData = [
% for comment_history in comment.history:
{
id: ${comment_history.comment_history_id},
text: 'v${comment_history.version}',
action: function () {
Rhodecode.comments.showVersion(
"${comment.comment_id}",
"${comment_history.comment_history_id}"
)
},
comment_version: "${comment_history.version}",
comment_author_username: "${comment_history.author.username}",
comment_author_gravatar: "${h.gravatar_url(comment_history.author.email, 16)}",
comment_created_on: '${h.age_component(comment_history.created_on, time_is_local=True)}',
},
% endfor
]
initVersionSelector("#${comment_version_selector}", {results: preLoadVersionData});
</script>
comments: edit functionality added
r4401 </div>
% else:
<div class="date" style="display: none">
comment-history: fixes/ui changes...
r4408 <input id="${comment_version_selector}" name="${comment_version_selector}"
type="hidden"
data-last-version="0">
comments: edit functionality added
r4401 </div>
%endif
comments: properly show version of pull request into added comments....
r1286 % if inline:
<span></span>
% else:
comments: link to resolved comment in FIX comment type.
r1360 <div class="status-change">
% if comment.pull_request:
pull-requests: prepare the migration of pull request to pyramid....
r1813 <a href="${h.route_path('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id)}">
comments: link to resolved comment in FIX comment type.
r1360 % if comment.status_change:
dan
pull-requests: change the naming from #NUM into !NUM....
r4039 ${_('pull request !{}').format(comment.pull_request.pull_request_id)}:
comments: link to resolved comment in FIX comment type.
r1360 % else:
dan
pull-requests: change the naming from #NUM into !NUM....
r4039 ${_('pull request !{}').format(comment.pull_request.pull_request_id)}
comments: link to resolved comment in FIX comment type.
r1360 % endif
</a>
% else:
comments: properly show version of pull request into added comments....
r1286 % if comment.status_change:
comments: link to resolved comment in FIX comment type.
r1360 ${_('Status change on commit')}:
comments: properly show version of pull request into added comments....
r1286 % endif
templating: use .mako as extensions for template files.
r1282 % endif
comments: link to resolved comment in FIX comment type.
r1360 </div>
comments: properly show version of pull request into added comments....
r1286 % endif
% if comment.status_change:
ui: changed status icons to <i> elements instead of div.
r3883 <i class="icon-circle review-status-${comment.status_change[0].status}"></i>
templating: use .mako as extensions for template files.
r1282 <div title="${_('Commit status')}" class="changeset-status-lbl">
${comment.status_change[0].status_lbl}
</div>
comments: properly show version of pull request into added comments....
r1286 % endif
templating: use .mako as extensions for template files.
r1282 <a class="permalink" href="#comment-${comment.comment_id}"> &para;</a>
<div class="comment-links-block">
comments: cleanup of PR versions/author tags.
r4409
comments: properly show version of pull request into added comments....
r1286 % if inline:
comments: cleanup of PR versions/author tags.
r4409 <a class="pr-version-inline" href="${request.current_route_path(_query=dict(version=comment.pull_request_version_id), _anchor='comment-{}'.format(comment.comment_id))}">
comments: use unified aggregation of comments counters....
r1332 % if outdated_at_ver:
pull-requests: show more info about version of comment vs latest version.
r2809 <code class="pr-version-num" title="${_('Outdated comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}">
comments: use unified aggregation of comments counters....
r1332 outdated ${'v{}'.format(pr_index_ver)} |
</code>
% elif pr_index_ver:
pull-requests: show more info about version of comment vs latest version.
r2809 <code class="pr-version-num" title="${_('Comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}">
comments: use unified aggregation of comments counters....
r1332 ${'v{}'.format(pr_index_ver)} |
</code>
% endif
comments: properly show version of pull request into added comments....
r1286 </a>
% else:
% if comment.pull_request_version_id and pr_index_ver:
comments: cleanup of PR versions/author tags.
r4409
comments: properly show version of pull request into added comments....
r1286 % if comment.outdated:
comments: cleanup of PR versions/author tags.
r4409 <a class="pr-version"
href="?version=${comment.pull_request_version_id}#comment-${comment.comment_id}"
>
pull-requests: show more info about version of comment vs latest version.
r2809 ${_('Outdated comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}
comments: cleanup of PR versions/author tags.
r4409 </a> |
comments: properly show version of pull request into added comments....
r1286 % else:
comments: cleanup of PR versions/author tags.
r4409 <a class="pr-version"
title="${_('Comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}"
href="${h.route_path('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id, version=comment.pull_request_version_id)}"
>
<code class="pr-version-num">
${'v{}'.format(pr_index_ver)}
</code>
</a> |
comments: properly show version of pull request into added comments....
r1286 % endif
comments: cleanup of PR versions/author tags.
r4409
comments: properly show version of pull request into added comments....
r1286 % endif
% endif
templating: use .mako as extensions for template files.
r1282 ## show delete comment if it's not a PR (regular comments) or it's PR that is not closed
## only super-admin, repo admin OR comment owner can delete, also hide delete if currently viewed comment is outdated
%if not outdated_at_ver and (not comment.pull_request or (comment.pull_request and not comment.pull_request.is_closed())):
## permissions to delete
comments: added immutable parameter to forbid editing/deleting certain comments
r4327 %if comment.immutable is False and (c.is_super_admin or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or comment.author.user_id == c.rhodecode_user.user_id):
comments: edit functionality added
r4401 <a onclick="return Rhodecode.comments.editComment(this);"
comment-history: UI fixes
r4404 class="edit-comment">${_('Edit')}</a>
comments: edit functionality added
r4401 | <a onclick="return Rhodecode.comments.deleteComment(this);"
comment-history: UI fixes
r4404 class="delete-comment">${_('Delete')}</a>
templating: use .mako as extensions for template files.
r1282 %else:
comments: fixed links/actions
r4405 <a class="tooltip edit-comment link-disabled" disabled="disabled" title="${_('Action unavailable')}">${_('Edit')}</a>
| <a class="tooltip edit-comment link-disabled" disabled="disabled" title="${_('Action unavailable')}">${_('Delete')}</a>
templating: use .mako as extensions for template files.
r1282 %endif
%else:
comments: fixed links/actions
r4405 <a class="tooltip edit-comment link-disabled" disabled="disabled" title="${_('Action unavailable')}">${_('Edit')}</a>
| <a class="tooltip edit-comment link-disabled" disabled="disabled" title="${_('Action unavailable')}">${_('Delete')}</a>
templating: use .mako as extensions for template files.
r1282 %endif
outdated-notes: show navigation on outdated comments
r1343 % if outdated_at_ver:
comments: edit functionality added
r4401 | <a onclick="return Rhodecode.comments.prevOutdatedComment(this);" class="tooltip prev-comment" title="${_('Jump to the previous outdated comment')}"> <i class="icon-angle-left"></i> </a>
| <a onclick="return Rhodecode.comments.nextOutdatedComment(this);" class="tooltip next-comment" title="${_('Jump to the next outdated comment')}"> <i class="icon-angle-right"></i></a>
outdated-notes: show navigation on outdated comments
r1343 % else:
comments: edit functionality added
r4401 | <a onclick="return Rhodecode.comments.prevComment(this);" class="tooltip prev-comment" title="${_('Jump to the previous comment')}"> <i class="icon-angle-left"></i></a>
| <a onclick="return Rhodecode.comments.nextComment(this);" class="tooltip next-comment" title="${_('Jump to the next comment')}"> <i class="icon-angle-right"></i></a>
outdated-notes: show navigation on outdated comments
r1343 % endif
templating: use .mako as extensions for template files.
r1282
</div>
</div>
<div class="text">
issue-tracker: cache active patterns in the template so we can re-use them when rendering comments....
r4202 ${h.render(comment.text, renderer=comment.renderer, mentions=True, repo_name=getattr(c, 'repo_name', None), active_pattern_entries=active_pattern_entries)}
templating: use .mako as extensions for template files.
r1282 </div>
</div>
</%def>
comments: allow submitting id of comment which submitted comment resolved....
r1325
templating: use .mako as extensions for template files.
r1282 ## generate main comments
comments: use unified aggregation of comments counters....
r1332 <%def name="generate_comments(comments, include_pull_request=False, is_pull_request=False)">
issue-tracker: cache active patterns in the template so we can re-use them when rendering comments....
r4202 <%
active_pattern_entries = h.get_active_pattern_entries(getattr(c, 'repo_name', None))
%>
outdated-notes: show navigation on outdated comments
r1343 <div class="general-comments" id="comments">
comments: use unified aggregation of comments counters....
r1332 %for comment in comments:
templating: use .mako as extensions for template files.
r1282 <div id="comment-tr-${comment.comment_id}">
## only render comments that are not from pull request, or from
## pull request and a status change
%if not comment.pull_request or (comment.pull_request and comment.status_change) or include_pull_request:
issue-tracker: cache active patterns in the template so we can re-use them when rendering comments....
r4202 ${comment_block(comment, active_pattern_entries=active_pattern_entries)}
templating: use .mako as extensions for template files.
r1282 %endif
</div>
%endfor
## to anchor ajax comments
<div id="injected_page_comments"></div>
</div>
</%def>
comments: allow submitting id of comment which submitted comment resolved....
r1325
templating: use .mako as extensions for template files.
r1282 <%def name="comments(post_url, cur_status, is_pull_request=False, is_compare=False, change_status=True, form_extras=None)">
<div class="comments">
<%
if is_pull_request:
placeholder = _('Leave a comment on this Pull Request.')
elif is_compare:
comments: fixed compare view comments.
r1331 placeholder = _('Leave a comment on {} commits in this range.').format(len(form_extras))
templating: use .mako as extensions for template files.
r1282 else:
placeholder = _('Leave a comment on this Commit.')
%>
comments: allow submitting id of comment which submitted comment resolved....
r1325
templating: use .mako as extensions for template files.
r1282 % if c.rhodecode_user.username != h.DEFAULT_USER:
comments: enabled resolution for general comments, and finalized how general comment is build
r1326 <div class="js-template" id="cb-comment-general-form-template">
## template generated for injection
${comment_form(form_type='general', review_statuses=c.commit_statuses, form_extras=form_extras)}
</div>
<div id="cb-comment-general-form-placeholder" class="comment-form ac">
comments: allow submitting id of comment which submitted comment resolved....
r1325 ## inject form here
</div>
<script type="text/javascript">
var lineNo = 'general';
comments: enabled resolution for general comments, and finalized how general comment is build
r1326 var resolvesCommentId = null;
comments: fixed compare view comments.
r1331 var generalCommentForm = Rhodecode.comments.createGeneralComment(
lineNo, "${placeholder}", resolvesCommentId);
// set custom success callback on rangeCommit
% if is_compare:
generalCommentForm.setHandleFormSubmit(function(o) {
var self = generalCommentForm;
var text = self.cm.getValue();
var status = self.getCommentStatus();
var commentType = self.getCommentType();
if (text === "" && !status) {
return;
}
// we can pick which commits we want to make the comment by
// selecting them via click on preview pane, this will alter the hidden inputs
var cherryPicked = $('#changeset_compare_view_content .compare_select.hl').length > 0;
var commitIds = [];
$('#changeset_compare_view_content .compare_select').each(function(el) {
var commitId = this.id.replace('row-', '');
if ($(this).hasClass('hl') || !cherryPicked) {
$("input[data-commit-id='{0}']".format(commitId)).val(commitId);
commitIds.push(commitId);
} else {
$("input[data-commit-id='{0}']".format(commitId)).val('')
}
});
self.setActionButtonsDisabled(true);
self.cm.setOption("readOnly", true);
var postData = {
'text': text,
'changeset_status': status,
'comment_type': commentType,
'commit_ids': commitIds,
'csrf_token': CSRF_TOKEN
};
var submitSuccessCallback = function(o) {
location.reload(true);
};
var submitFailCallback = function(){
self.resetCommentFormState(text)
};
self.submitAjaxPOST(
self.submitUrl, postData, submitSuccessCallback, submitFailCallback);
});
% endif
comments: allow submitting id of comment which submitted comment resolved....
r1325 </script>
templating: use .mako as extensions for template files.
r1282 % else:
comments: allow submitting id of comment which submitted comment resolved....
r1325 ## form state when not logged in
templating: use .mako as extensions for template files.
r1282 <div class="comment-form ac">
<div class="comment-area">
<div class="comment-area-header">
<ul class="nav-links clearfix">
<li class="active">
<a class="disabled" href="#edit-btn" disabled="disabled" onclick="return false">${_('Write')}</a>
</li>
<li class="">
<a class="disabled" href="#preview-btn" disabled="disabled" onclick="return false">${_('Preview')}</a>
</li>
</ul>
</div>
<div class="comment-area-write" style="display: block;">
<div id="edit-container">
<div style="padding: 40px 0">
${_('You need to be logged in to leave comments.')}
routing: remove usage of url.current from pylons.
r2104 <a href="${h.route_path('login', _query={'came_from': h.current_route_path(request)})}">${_('Login now')}</a>
templating: use .mako as extensions for template files.
r1282 </div>
</div>
<div id="preview-container" class="clearfix" style="display: none;">
<div id="preview-box" class="preview-box"></div>
</div>
</div>
<div class="comment-area-footer">
<div class="toolbar">
<div class="toolbar-text">
</div>
</div>
</div>
</div>
<div class="comment-footer">
</div>
</div>
% endif
comments: allow submitting id of comment which submitted comment resolved....
r1325 <script type="text/javascript">
bindToggleButtons();
</script>
templating: use .mako as extensions for template files.
r1282 </div>
comments: allow submitting id of comment which submitted comment resolved....
r1325 </%def>
<%def name="comment_form(form_type, form_id='', lineno_id='{1}', review_statuses=None, form_extras=None)">
comments: added support for adding comment attachments using the artifacts logic....
r3973
comments: allow submitting id of comment which submitted comment resolved....
r1325 ## comment injected based on assumption that user is logged in
ui: updated comments box with latest styling.
r4130 <form ${('id="{}"'.format(form_id) if form_id else '') |n} action="#" method="GET">
templating: use .mako as extensions for template files.
r1282
comments: allow submitting id of comment which submitted comment resolved....
r1325 <div class="comment-area">
<div class="comment-area-header">
ui: updated comments box with latest styling.
r4130 <div class="pull-left">
<ul class="nav-links clearfix">
<li class="active">
<a href="#edit-btn" tabindex="-1" id="edit-btn_${lineno_id}">${_('Write')}</a>
</li>
<li class="">
<a href="#preview-btn" tabindex="-1" id="preview-btn_${lineno_id}">${_('Preview')}</a>
</li>
</ul>
</div>
<div class="pull-right">
<span class="comment-area-text">${_('Mark as')}:</span>
<select class="comment-type" id="comment_type_${lineno_id}" name="comment_type">
% for val in c.visual.comment_types:
<option value="${val}">${val.upper()}</option>
% endfor
</select>
</div>
comments: allow submitting id of comment which submitted comment resolved....
r1325 </div>
<div class="comment-area-write" style="display: block;">
<div id="edit-container_${lineno_id}">
<textarea id="text_${lineno_id}" name="text" class="comment-block-ta ac-input"></textarea>
</div>
<div id="preview-container_${lineno_id}" class="clearfix" style="display: none;">
<div id="preview-box_${lineno_id}" class="preview-box"></div>
</div>
</div>
templating: use .mako as extensions for template files.
r1282
comments: added support for adding comment attachments using the artifacts logic....
r3973 <div class="comment-area-footer comment-attachment-uploader">
comments: allow submitting id of comment which submitted comment resolved....
r1325 <div class="toolbar">
comments: added support for adding comment attachments using the artifacts logic....
r3973
<div class="comment-attachment-text">
<div class="dropzone-text">
${_("Drag'n Drop files here or")} <span class="link pick-attachment">${_('Choose your files')}</span>.<br>
</div>
<div class="dropzone-upload" style="display:none">
<i class="icon-spin animate-spin"></i> ${_('uploading...')}
</div>
</div>
## comments dropzone template, empty on purpose
<div style="display: none" class="comment-attachment-uploader-template">
<div class="dz-file-preview" style="margin: 0">
<div class="dz-error-message"></div>
</div>
</div>
comments: allow submitting id of comment which submitted comment resolved....
r1325 </div>
</div>
</div>
<div class="comment-footer">
templating: use .mako as extensions for template files.
r1282
ui: updated comments box with latest styling.
r4130 ## inject extra inputs into the form
% if form_extras and isinstance(form_extras, (list, tuple)):
<div id="comment_form_extras">
% for form_ex_el in form_extras:
${form_ex_el|n}
% endfor
</div>
% endif
<div class="action-buttons">
% if form_type != 'inline':
<div class="action-buttons-extra"></div>
% endif
<input class="btn btn-success comment-button-input" id="save_${lineno_id}" name="save" type="submit" value="${_('Comment')}">
## inline for has a file, and line-number together with cancel hide button.
% if form_type == 'inline':
<input type="hidden" name="f_path" value="{0}">
<input type="hidden" name="line" value="${lineno_id}">
<button type="button" class="cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);">
${_('Cancel')}
</button>
% endif
</div>
comments: allow submitting id of comment which submitted comment resolved....
r1325 % if review_statuses:
<div class="status_box">
comments: enabled resolution for general comments, and finalized how general comment is build
r1326 <select id="change_status_${lineno_id}" name="changeset_status">
comments: allow submitting id of comment which submitted comment resolved....
r1325 <option></option> ## Placeholder
% for status, lbl in review_statuses:
<option value="${status}" data-status="${status}">${lbl}</option>
%if is_pull_request and change_status and status in ('approved', 'rejected'):
<option value="${status}_closed" data-status="${status}">${lbl} & ${_('Closed')}</option>
%endif
% endfor
</select>
</div>
% endif
templating: use .mako as extensions for template files.
r1282
ui: updated comments box with latest styling.
r4130 <div class="toolbar-text">
<% renderer_url = '<a href="%s">%s</a>' % (h.route_url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper()) %>
${_('Comments parsed using {} syntax.').format(renderer_url)|n} <br/>
<span class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span>
${_('and')}
<span class="tooltip" title="${_('Start typing with / for certain actions to be triggered via text box.')}">`/` autocomplete</span>
${_('actions supported.')}
comments: allow submitting id of comment which submitted comment resolved....
r1325 </div>
</div>
</form>
</%def>