wassname/flask-security
1
0
Fork 0
mirror of https://github.com/wassname/flask-security.git synced 2026-08-11 11:18:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/mattupstate/flask-security into develop

Browse Source 
Conflicts:
	flask_security/views.py
This commit is contained in:
Bruno Rocha
2013-12-23 13:55:13 -02:00
parent 910d80d511 d88299fc9b
commit 01a4199a16
19 changed files with 290 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flask_security/views.py
+3 -1
View File
@@ -123,6 +123,7 @@ def register():
if not request.json:
return redirect(get_post_register_redirect())
return _render_json(form, True)
if request.json:
return _render_json(form)
@@ -301,9 +302,10 @@ def change_password():
get_url(_security.post_login_view))
if request.json:
form.user = current_user
return _render_json(form)
return _security.render_template('security/change_password.html',
return _security.render_template(config_value('CHANGE_PASSWORD_TEMPLATE'),
change_password_form=form,
**_ctx('change_password'))