@@ -75,7 +75,7 @@ class AuthLdap(object):
if "," in username:
raise LdapUsernameError("invalid character in username: ,")
try:
ldap.set_option(ldap.OPT_X_TLS_CACERTFILE, '/etc/openldap/cacerts')
ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, '/etc/openldap/cacerts')
ldap.set_option(ldap.OPT_NETWORK_TIMEOUT, 10)
server = ldap.initialize(self.LDAP_SERVER)
if self.ldap_version == 2:
@@ -50,7 +50,8 @@
<td>${h.bool2icon(user.is_ldap)}</td>
<td>
${h.form(url('user', id=user.user_id),method='delete')}
${h.submit('remove','delete',id="remove_user_%s" % user.user_id,class_="delete_icon action_button")}
${h.submit('remove_','delete',id="remove_user_%s" % user.user_id,
class_="delete_icon action_button",onclick="return confirm('Confirm to delete this user');")}
${h.end_form()}
</td>
</tr>
@@ -569,7 +569,7 @@ E.onDOMReady(function(e){
<div class="box">
<div class="title">
<div class="breadcrumbs">${h.link_to(_('Last ten changes'),h.url('shortlog_home',repo_name=c.repo_name))}</div>
<div class="breadcrumbs">${h.link_to(_('Shortlog'),h.url('shortlog_home',repo_name=c.repo_name))}</div>
</div>
<div class="table">
<div id="shortlog_data">
Status change: