From 39d4cf362b74d9c62b05c1a273de749b18368a12 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Thu, 21 Nov 2019 19:38:26 +0000 Subject: [PATCH] Fix url_for crash on "home_page" --- .dockerignore | 3 +++ app/blueprints/homepage/__init__.py | 2 +- app/blueprints/threads/__init__.py | 6 +++--- app/blueprints/users/githublogin.py | 6 +++--- app/blueprints/users/profile.py | 2 +- app/templates/users/set_password.html | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..db3fdd0d --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +.git +data +uploads diff --git a/app/blueprints/homepage/__init__.py b/app/blueprints/homepage/__init__.py index 0d50bbd1..76dbb92e 100644 --- a/app/blueprints/homepage/__init__.py +++ b/app/blueprints/homepage/__init__.py @@ -8,7 +8,7 @@ from sqlalchemy.sql.expression import func @bp.route("/") @menu.register_menu(bp, ".", "Home") -def home_page(): +def home(): query = Package.query.filter_by(approved=True, soft_deleted=False) count = query.count() new = query.order_by(db.desc(Package.created_at)).limit(8).all() diff --git a/app/blueprints/threads/__init__.py b/app/blueprints/threads/__init__.py index 0eee201a..73d64c2d 100644 --- a/app/blueprints/threads/__init__.py +++ b/app/blueprints/threads/__init__.py @@ -87,7 +87,7 @@ def view(id): if package: return redirect(package.getDetailsURL()) else: - return redirect(url_for("home_page")) + return redirect(url_for("homepage.home")) if len(comment) <= 500 and len(comment) > 3: reply = ThreadReply() @@ -150,7 +150,7 @@ def new(): # Check that user can make the thread if not package.checkPerm(current_user, Permission.CREATE_THREAD): flash("Unable to create thread!", "error") - return redirect(url_for("home_page")) + return redirect(url_for("homepage.home")) # Only allow creating one thread when not approved elif is_review_thread and package.review_thread is not None: @@ -163,7 +163,7 @@ def new(): if package: return redirect(package.getDetailsURL()) else: - return redirect(url_for("home_page")) + return redirect(url_for("homepage.home")) # Set default values elif request.method == "GET": diff --git a/app/blueprints/users/githublogin.py b/app/blueprints/users/githublogin.py index 458c637a..56c44128 100644 --- a/app/blueprints/users/githublogin.py +++ b/app/blueprints/users/githublogin.py @@ -54,10 +54,10 @@ def github_authorized(oauth_token): current_user.github_username = username db.session.commit() flash("Linked github to account", "success") - return redirect(url_for("home_page")) + return redirect(url_for("homepage.home")) else: flash("Github account is already associated with another user", "danger") - return redirect(url_for("home_page")) + return redirect(url_for("homepage.home")) # If not logged in, log in else: @@ -68,7 +68,7 @@ def github_authorized(oauth_token): if current_user.password is None: return redirect(next_url or url_for("users.set_password", optional=True)) else: - return redirect(next_url or url_for("home_page")) + return redirect(next_url or url_for("homepage.home")) else: flash("Authorization failed [err=gh-login-failed]", "danger") return redirect(url_for("user.login")) diff --git a/app/blueprints/users/profile.py b/app/blueprints/users/profile.py index a3c592c3..8e6bfe94 100644 --- a/app/blueprints/users/profile.py +++ b/app/blueprints/users/profile.py @@ -306,4 +306,4 @@ def verify_email(): if current_user.is_authenticated: return redirect(url_for("users.profile", username=current_user.username)) else: - return redirect(url_for("home_page")) + return redirect(url_for("homepage.home")) diff --git a/app/templates/users/set_password.html b/app/templates/users/set_password.html index 3fb7b26b..2d520212 100644 --- a/app/templates/users/set_password.html +++ b/app/templates/users/set_password.html @@ -10,7 +10,7 @@
It is recommended that you set a password for your account. - Skip + Skip
{% endif %}