Mercurial > kallithea
changeset 739:554ed64953ff beta
fixes #76 added confirmation dialog for user removal.
small ldap fix + renamed summary changes to shortlog
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 23 Nov 2010 01:54:33 +0100 |
| parents | ddaddffcb7dc |
| children | 9279dfedcf93 |
| files | rhodecode/lib/auth_ldap.py rhodecode/templates/admin/users/users.html rhodecode/templates/summary/summary.html |
| diffstat | 3 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/auth_ldap.py Mon Nov 22 19:00:11 2010 +0100 +++ b/rhodecode/lib/auth_ldap.py Tue Nov 23 01:54:33 2010 +0100 @@ -75,7 +75,7 @@ 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:
--- a/rhodecode/templates/admin/users/users.html Mon Nov 22 19:00:11 2010 +0100 +++ b/rhodecode/templates/admin/users/users.html Tue Nov 23 01:54:33 2010 +0100 @@ -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>
--- a/rhodecode/templates/summary/summary.html Mon Nov 22 19:00:11 2010 +0100 +++ b/rhodecode/templates/summary/summary.html Tue Nov 23 01:54:33 2010 +0100 @@ -569,7 +569,7 @@ <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">