Browse Source

Display login message if account is not active

Fixes #205.
sh4nks 8 years ago
parent
commit
c5b94493ca
2 changed files with 6 additions and 2 deletions
  1. 5 2
      flaskbb/auth/views.py
  2. 1 0
      requirements.txt

+ 5 - 2
flaskbb/auth/views.py

@@ -89,7 +89,10 @@ def login():
     if form.validate_on_submit():
     if form.validate_on_submit():
         try:
         try:
             user = User.authenticate(form.login.data, form.password.data)
             user = User.authenticate(form.login.data, form.password.data)
-            login_user(user, remember=form.remember_me.data)
+            if not login_user(user, remember=form.remember_me.data):
+                flash(_("In order to use your account you have to activate it "
+                        "through the link we have sent to your email "
+                        "address."), "danger")
             return redirect_or_next(url_for("forum.index"))
             return redirect_or_next(url_for("forum.index"))
         except AuthenticationError:
         except AuthenticationError:
             flash(_("Wrong username or password."), "danger")
             flash(_("Wrong username or password."), "danger")
@@ -153,7 +156,7 @@ def register():
             login_user(user)
             login_user(user)
             flash(_("Thanks for registering."), "success")
             flash(_("Thanks for registering."), "success")
 
 
-        return redirect_or_next(current_user.url)
+        return redirect_or_next(url_for('forum.index'))
 
 
     return render_template("auth/register.html", form=form)
     return render_template("auth/register.html", form=form)
 
 

+ 1 - 0
requirements.txt

@@ -39,6 +39,7 @@ six==1.10.0
 speaklater==1.3
 speaklater==1.3
 SQLAlchemy==1.0.14
 SQLAlchemy==1.0.14
 SQLAlchemy-Utils==0.32.9
 SQLAlchemy-Utils==0.32.9
+Unidecode==0.4.19
 vine==1.1.1
 vine==1.1.1
 Werkzeug==0.11.10
 Werkzeug==0.11.10
 Whoosh==2.7.4
 Whoosh==2.7.4