aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2014-05-15 07:29:49 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2014-05-15 07:29:49 +0200
commit1412bb638ea937e65411257756cd3080fff74399 (patch)
tree8c35c2c8f8a21803411d0ec791af09649d72406e
parentbad image... (diff)
downloadnewspipe-1412bb638ea937e65411257756cd3080fff74399.tar.gz
newspipe-1412bb638ea937e65411257756cd3080fff74399.tar.bz2
newspipe-1412bb638ea937e65411257756cd3080fff74399.zip
Bugfix.
-rw-r--r--pyaggr3g470r/views.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pyaggr3g470r/views.py b/pyaggr3g470r/views.py
index 78523d56..5028a950 100644
--- a/pyaggr3g470r/views.py
+++ b/pyaggr3g470r/views.py
@@ -716,7 +716,6 @@ def create_user(user_id=None):
if form.password.data != "":
user.set_password(form.password.data)
user.roles = [role_user]
- user.activation_key = ""
db.session.commit()
flash(gettext('User') + ' ' + user.nickname + ' ' + gettext('successfully updated.'), 'success')
else:
@@ -725,6 +724,7 @@ def create_user(user_id=None):
email=form.email.data,
pwdhash=generate_password_hash(form.password.data))
user.roles.extend([role_user])
+ user.activation_key = ""
db.session.add(user)
db.session.commit()
flash(gettext('User') + ' ' + user.nickname + ' ' + gettext('successfully created.'), 'success')
@@ -778,7 +778,7 @@ def delete_user(user_id=None):
@admin_permission.require()
def disable_user(user_id=None):
"""
- Enable or disable the API key of a user.
+ Enable or disable the account of a user.
"""
user = User.query.filter(User.id == user_id).first()
if user is not None:
bgstack15