Merge branch 'develop' into configurable_login_fields

This commit is contained in:
Matt Wright
2013-12-19 12:16:02 -05:00
3 changed files with 5 additions and 1 deletions
+1
View File
@@ -55,6 +55,7 @@ _default_config = {
'LOGIN_USER_TEMPLATE': 'security/login_user.html',
'REGISTER_USER_TEMPLATE': 'security/register_user.html',
'RESET_PASSWORD_TEMPLATE': 'security/reset_password.html',
'CHANGE_PASSWORD_TEMPLATE': 'security/change_password.html',
'SEND_CONFIRMATION_TEMPLATE': 'security/send_confirmation.html',
'SEND_LOGIN_TEMPLATE': 'security/send_login.html',
'CONFIRMABLE': False,
+1 -1
View File
@@ -303,7 +303,7 @@ def change_password():
if request.json:
return _render_json(form)
return render_template('security/change_password.html',
return render_template(config_value('CHANGE_PASSWORD_TEMPLATE'),
change_password_form=form,
**_ctx('change_password'))