|
|
|---|
| 48 |
|
48 |
|
| 49 |
_ = Translation( 'ucs-school-umc-schoolusers' ).translate |
49 |
_ = Translation( 'ucs-school-umc-schoolusers' ).translate |
| 50 |
|
50 |
|
| 51 |
## FIXME: remove in UCS@school 3.2, replace by str(e): Bug #27940, 30089, 30088 |
|
|
| 52 |
def get_exception_msg(e): |
| 53 |
msg = getattr(e, 'message', '') |
| 54 |
if e.args: |
| 55 |
if e.args[0] != msg or len(e.args) != 1: |
| 56 |
for arg in e.args: |
| 57 |
msg += ' %s' % (arg) |
| 58 |
return msg |
| 59 |
|
| 60 |
class Instance( SchoolBaseModule ): |
51 |
class Instance( SchoolBaseModule ): |
| 61 |
@LDAP_Connection() |
52 |
@LDAP_Connection() |
| 62 |
def query( self, request, ldap_user_read = None, ldap_position = None, search_base = None ): |
53 |
def query( self, request, ldap_user_read = None, ldap_position = None, search_base = None ): |
|
|
|---|
| 108 |
MODULE.process( '_reset_passwords: dn=%s' % ur.dn ) |
99 |
MODULE.process( '_reset_passwords: dn=%s' % ur.dn ) |
| 109 |
MODULE.process( '_reset_passwords: exception=%s' % str( e.__class__ ) ) |
100 |
MODULE.process( '_reset_passwords: exception=%s' % str( e.__class__ ) ) |
| 110 |
MODULE.process( '_reset_passwords: exception=%s' % str( e.message ) ) |
101 |
MODULE.process( '_reset_passwords: exception=%s' % str( e.message ) ) |
| 111 |
return '%s' % (get_exception_msg(e)) |
102 |
return '%s' % (e) |
| 112 |
|
103 |
|
| 113 |
@LDAP_Connection( USER_READ, USER_WRITE ) |
104 |
@LDAP_Connection( USER_READ, USER_WRITE ) |
| 114 |
def password_reset( self, request, ldap_user_read = None, ldap_user_write = None, ldap_position = None, search_base = None ): |
105 |
def password_reset( self, request, ldap_user_read = None, ldap_user_write = None, ldap_position = None, search_base = None ): |