Show More
@@ -75,7 +75,7 b' class AuthLdap(object):' | |||
|
75 | 75 | if "," in username: |
|
76 | 76 | raise LdapUsernameError("invalid character in username: ,") |
|
77 | 77 | try: |
|
78 |
ldap.set_option(ldap.OPT_X_TLS_CACERT |
|
|
78 | ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, '/etc/openldap/cacerts') | |
|
79 | 79 | ldap.set_option(ldap.OPT_NETWORK_TIMEOUT, 10) |
|
80 | 80 | server = ldap.initialize(self.LDAP_SERVER) |
|
81 | 81 | if self.ldap_version == 2: |
@@ -50,7 +50,8 b'' | |||
|
50 | 50 | <td>${h.bool2icon(user.is_ldap)}</td> |
|
51 | 51 | <td> |
|
52 | 52 | ${h.form(url('user', id=user.user_id),method='delete')} |
|
53 |
${h.submit('remove','delete',id="remove_user_%s" % user.user_id, |
|
|
53 | ${h.submit('remove_','delete',id="remove_user_%s" % user.user_id, | |
|
54 | class_="delete_icon action_button",onclick="return confirm('Confirm to delete this user');")} | |
|
54 | 55 | ${h.end_form()} |
|
55 | 56 | </td> |
|
56 | 57 | </tr> |
@@ -569,7 +569,7 b' E.onDOMReady(function(e){' | |||
|
569 | 569 | |
|
570 | 570 | <div class="box"> |
|
571 | 571 | <div class="title"> |
|
572 |
<div class="breadcrumbs">${h.link_to(_(' |
|
|
572 | <div class="breadcrumbs">${h.link_to(_('Shortlog'),h.url('shortlog_home',repo_name=c.repo_name))}</div> | |
|
573 | 573 | </div> |
|
574 | 574 | <div class="table"> |
|
575 | 575 | <div id="shortlog_data"> |
General Comments 0
You need to be logged in to leave comments.
Login now