haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-16 15:19:06 +00:00
Code Issues Releases Wiki Activity

Modified user password resetting, make messages more clear

Browse Source
This commit is contained in:
zhengxie
2012-12-05 13:35:11 +08:00
parent 3486fb4223
commit 9e0e1ed3cc
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
templates/sys_useradmin.html
View File

@@ -1,5 +1,6 @@
{% extends "admin_base.html" %} {% extends "admin_base.html" %}
{% load i18n %} {% load i18n %}
{% load url from future %}
{% block nav_useradmin_class %}class="cur"{% endblock %} {% block nav_useradmin_class %}class="cur"{% endblock %}
{% block left_panel %} {% block left_panel %}
<h3>{% trans "Operations" %}</h3> <h3>{% trans "Operations" %}</h3>
@@ -28,7 +29,7 @@
<td> <td>
{% if not user.is_self %} {% if not user.is_self %}
<a href="#" class="remove-user-btn op" data-url="{{ SITE_ROOT }}useradmin/remove/{{ user.props.id }}/" data-target="{{ user.props.email }}">{% trans "Delete" %}</a> <a href="#" class="remove-user-btn op" data-url="{{ SITE_ROOT }}useradmin/remove/{{ user.props.id }}/" data-target="{{ user.props.email }}">{% trans "Delete" %}</a>
<a href="#" class="reset-user-btn op" data-url="{{ SITE_ROOT }}useradmin/password/reset/{{ user.props.id }}/" data-target="{{ user.props.email }}">{% trans "Password Reset" %}</a> <a href="#" class="reset-user-btn op" data-url="{% url 'user_reset' user.id %}" data-target="{{ user.props.email }}">{% trans "ResetPwd" %}</a>
{% endif %} {% endif %}
</td> </td>
</tr> </tr>

2
urls.py
View File

@@ -74,7 +74,7 @@ urlpatterns = patterns('',
(r'^useradmin/remove/(?P<user_id>[^/]+)/$', user_remove), (r'^useradmin/remove/(?P<user_id>[^/]+)/$', user_remove),
(r'^useradmin/info/(?P<email>[^/]+)/$', user_info), (r'^useradmin/info/(?P<email>[^/]+)/$', user_info),
(r'^useradmin/activate/(?P<user_id>[^/]+)/$', activate_user), (r'^useradmin/activate/(?P<user_id>[^/]+)/$', activate_user),
(r'^useradmin/password/reset/(?P<user_id>[^/]+)/$', user_reset), url(r'^useradmin/password/reset/(?P<user_id>[^/]+)/$', user_reset, name='user_reset'),
### Apps ### ### Apps ###
(r'^api/', include('api.urls')), (r'^api/', include('api.urls')),

12
views.py
View File

@@ -1871,9 +1871,13 @@ def send_user_reset_email(request, email, password):
try: try:
send_mail(_(u'Password Reset'), t.render(Context(c)), send_mail(_(u'Password Reset'), t.render(Context(c)),
None, [email], fail_silently=False) None, [email], fail_silently=False)
messages.success(request, _(u'Successfully sending mail')) msg = _('Successfully resetting password to %(passwd)s, an email has been sent to %(user)s.') % \
{'passwd': password, 'user': email}
messages.success(request, msg)
except: except:
messages.error(request, _(u'Failed to send mail')) msg = _('Successfully resetting password to %(passwd)s, but failed to send email to %(user)s, please check your email configuration.') % \
{'passwd':password, 'user': email}
messages.error(request, msg)
@login_required @login_required
@sys_staff_required @sys_staff_required
@@ -1884,10 +1888,10 @@ def user_reset(request, user_id):
user.set_password(INIT_PASSWD) user.set_password(INIT_PASSWD)
user.save() user.save()
messages.success(request, _(u'Successfully resetting password'))
if hasattr(settings, 'EMAIL_HOST'): if hasattr(settings, 'EMAIL_HOST'):
send_user_reset_email(request, user.email, INIT_PASSWD) send_user_reset_email(request, user.email, INIT_PASSWD)
else:
messages.success(request, _(u'Successfully resetting password to %s') % INIT_PASSWD)
except User.DoesNotExist: except User.DoesNotExist:
msg = _(u'Failed to reset password: user does not exist') msg = _(u'Failed to reset password: user does not exist')
messages.error(request, msg) messages.error(request, msg)