Files
@ 2aa7f454204e
Branch filter:
Location: kallithea/rhodecode/templates/changeset/changeset_file_comment.html - annotation
2aa7f454204e
2.3 KiB
text/html
fixes #298, ldap email addresses created by rhodecode automatically during first login didn't get converted to lower case, which lead to lookup failures and than wrong checks for uniqueness. Fixed that by putting a setter on db model column that will enforce converting to lowercase.
d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd 7c487d2678c7 d2de0c2f02cd d2de0c2f02cd 7276b170ce8b d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd 60a00fd76d58 d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd d2de0c2f02cd 7276b170ce8b 7276b170ce8b 7276b170ce8b 7276b170ce8b 7276b170ce8b 7276b170ce8b 7276b170ce8b aa6a1c6f2ac5 7276b170ce8b 7276b170ce8b cf370b6d3977 cf370b6d3977 3efc47f59639 7276b170ce8b 7276b170ce8b 7276b170ce8b 7276b170ce8b 60a00fd76d58 60a00fd76d58 7276b170ce8b 7276b170ce8b aa6a1c6f2ac5 aa6a1c6f2ac5 aa6a1c6f2ac5 aa6a1c6f2ac5 aa6a1c6f2ac5 aa6a1c6f2ac5 aa6a1c6f2ac5 aa6a1c6f2ac5 60a00fd76d58 aa6a1c6f2ac5 aa6a1c6f2ac5 aa6a1c6f2ac5 7276b170ce8b 7276b170ce8b d2de0c2f02cd | ##usage:
## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
## ${comment.comment_block(co)}
##
<%def name="comment_block(co)">
<div class="comment" id="comment-${co.comment_id}">
<div class="meta">
<span class="user">
<img src="${h.gravatar_url(co.author.email, 20)}" />
${co.author.username}
</span>
<a href="${h.url.current(anchor='comment-%s' % co.comment_id)}"> ${_('commented on')} </a>
${h.short_id(co.revision)}
%if co.f_path:
${_(' in file ')}
${co.f_path}:L ${co.line_no}
%endif
<span class="date">
${h.age(co.modified_at)}
</span>
</div>
<div class="text">
%if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id:
<div class="buttons">
<span onClick="deleteComment(${co.comment_id})" class="delete-comment ui-btn">${_('Delete')}</span>
</div>
%endif
${h.rst(co.text)|n}
</div>
</div>
</%def>
<%def name="comment_inline_form()">
<div id='comment-inline-form-template' style="display:none">
<div class="comment-inline-form">
%if c.rhodecode_user.username != 'default':
${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id))}
<div class="clearfix">
<div class="comment-help">${_('Commenting on line')} {1} ${_('comments parsed using')}
<a href="${h.url('rst_help')}">RST</a> ${_('syntax')}</div>
<textarea id="text_{1}" name="text"></textarea>
</div>
<div class="comment-button">
<input type="hidden" name="f_path" value="{0}">
<input type="hidden" name="line" value="{1}">
${h.submit('save', _('Comment'), class_='ui-btn')}
${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')}
</div>
${h.end_form()}
%else:
${h.form('')}
<div class="clearfix">
<div class="comment-help">
${'You need to be logged in to comment.'} <a href="${h.url('login_home',came_from=h.url.current())}">${_('Login now')}</a>
</div>
</div>
<div class="comment-button">
${h.reset('hide-inline-form', _('Hide'), class_='ui-btn hide-inline-form')}
</div>
${h.end_form()}
%endif
</div>
</div>
</%def>
|