diff --git a/files/routes/front.py b/files/routes/front.py index 786ebca579..43a76bdc47 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -269,6 +269,7 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false" posts = g.db.query(Submission) if sub: posts = posts.filter_by(sub=sub.name) + elif SITE_NAME == 'Drama': posts = posts.filter(Submission.sub == None) else: if SITE_NAME == 'Ruqqus': posts = posts.filter(Submission.sub != None) @@ -347,6 +348,7 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false" if (sort == "hot" or (v and v.id == Q_ID)) and page == 1 and ccmode == "false" and not gt and not lt: pins = g.db.query(Submission).filter(Submission.stickied != None, Submission.is_banned == False) if sub: pins = pins.filter_by(sub=sub.name) + elif SITE_NAME == 'Drama': pins = pins.filter(Submission.sub == None) else: if SITE_NAME == 'Ruqqus': pins = pins.filter(Submission.sub != None) diff --git a/files/routes/posts.py b/files/routes/posts.py index e48828f9b2..206ed4e5c3 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -126,7 +126,7 @@ def submit_get(v, sub=None): if request.path.startswith('/s/') and not sub: abort(404) - SUBS = tuple(x[0] for x in g.db.query(Sub.name).order_by(Sub.name).all()) + SUBS = () if SITE_NAME == 'Drama' and not sub else tuple(x[0] for x in g.db.query(Sub.name).order_by(Sub.name).all()) return render_template("submit.html", SUBS=SUBS, v=v, sub=sub, ghost=submit_ghost(v,g.db)) @@ -854,7 +854,7 @@ def submit_post(v, sub=None): def error(error): if request.headers.get("Authorization") or request.headers.get("xhr"): return {"error": error}, 403 - SUBS = tuple(x[0] for x in g.db.query(Sub.name).order_by(Sub.name).all()) + SUBS = () if SITE_NAME == 'Drama' and not sub else tuple(x[0] for x in g.db.query(Sub.name).order_by(Sub.name).all()) return render_template("submit.html", SUBS=SUBS, v=v, error=error, title=title, url=url, body=body, ghost=submit_ghost(v,g.db)), 400 diff --git a/files/templates/submit.html b/files/templates/submit.html index 1690fe6778..03c34d1633 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -79,23 +79,25 @@ - + {% if SITE_NAME != 'Drama' or sub %} + -
- + {% if SITE_NAME != 'Ruqqus' %} + + {% endif %} - {% for s in SUBS %} - - {% endfor %} - -
+ {% for s in SUBS %} + + {% endfor %} + + + {% endif %}