Browse Source

Registration can now be enabled or disabled.

Peter Justin 9 years ago
parent
commit
ae272d78c8
2 changed files with 5 additions and 4 deletions
  1. 3 4
      flaskbb/auth/views.py
  2. 2 0
      flaskbb/templates/layout.html

+ 3 - 4
flaskbb/auth/views.py

@@ -88,11 +88,11 @@ def register():
     Register a new user.
     """
     if current_user is not None and current_user.is_authenticated:
-        return redirect(url_for("user.profile",
-                                username=current_user.username))
+        return redirect_or_next(current_user.url)
 
     if not flaskbb_config["REGISTRATION_ENABLED"]:
         flash(_("The registration has been disabled."), "info")
+        return redirect(url_for("forum.index"))
 
     if current_app.config["RECAPTCHA_ENABLED"]:
         form = RegisterRecaptchaForm(request.form)
@@ -108,8 +108,7 @@ def register():
         login_user(user)
 
         flash(_("Thanks for registering."), "success")
-        return redirect(url_for("user.profile",
-                                username=current_user.username))
+        return redirect_or_next(current_user.url)
 
     return render_template("auth/register.html", form=form)
 

+ 2 - 0
flaskbb/templates/layout.html

@@ -135,7 +135,9 @@
                                     </a>
                                     <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
                                     <ul class="dropdown-menu" role="menu">
+                                        {% if flaskbb_config["REGISTRATION_ENABLED"] %}
                                         <li><a href="{{ url_for('auth.register') }}">{% trans %}Register{% endtrans %}</a></li>
+                                        {% endif %}
                                         <li><a href="{{ url_for('auth.forgot_password') }}">{% trans %}Reset Password{% endtrans %}</a></li>
                                     </ul>
                                 </div>