Modified user password resetting, make messages more clear

templates/sys_useradmin.html

@@ -1,5 +1,6 @@
 {% extends "admin_base.html" %}
 {% load i18n %}
+{% load url from future %}
 {% block nav_useradmin_class %}class="cur"{% endblock %}
 {% block left_panel %}
 <h3>{% trans "Operations" %}</h3>
@@ -28,7 +29,7 @@
         <td>
           {% 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="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 %}
         </td>
     </tr>

urls.py

@@ -74,7 +74,7 @@ urlpatterns = patterns('',
     (r'^useradmin/remove/(?P<user_id>[^/]+)/$', user_remove),
     (r'^useradmin/info/(?P<email>[^/]+)/$', user_info),
     (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 ###
     (r'^api/', include('api.urls')),

views.py

@@ -1871,9 +1871,13 @@ def send_user_reset_email(request, email, password):
     try:
         send_mail(_(u'Password Reset'), t.render(Context(c)),
                   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:
-        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
 @sys_staff_required
@@ -1884,10 +1888,10 @@ def user_reset(request, user_id):
         user.set_password(INIT_PASSWD)
         user.save()
 
-        messages.success(request, _(u'Successfully resetting password'))
-
         if hasattr(settings, 'EMAIL_HOST'):
             send_user_reset_email(request, user.email, INIT_PASSWD)
+        else:
+            messages.success(request, _(u'Successfully resetting password to %s') % INIT_PASSWD)
     except User.DoesNotExist:
         msg = _(u'Failed to reset password: user does not exist')
         messages.error(request, msg)