sdf
This commit is contained in:
parent
696a6daec5
commit
47cee753a5
1 changed files with 4 additions and 0 deletions
|
@ -295,6 +295,8 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false"
|
||||||
|
|
||||||
if sub:
|
if sub:
|
||||||
posts = posts.filter_by(sub=sub.name)
|
posts = posts.filter_by(sub=sub.name)
|
||||||
|
elif not v and subs == 1:
|
||||||
|
posts = posts.filter(Submission.sub == None)
|
||||||
elif subs == 1:
|
elif subs == 1:
|
||||||
posts = posts.filter(or_(Submission.sub == None, Submission.sub.in_(v.subbed_subs)))
|
posts = posts.filter(or_(Submission.sub == None, Submission.sub.in_(v.subbed_subs)))
|
||||||
elif subs == 2:
|
elif subs == 2:
|
||||||
|
@ -370,6 +372,8 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false"
|
||||||
pins = g.db.query(Submission).filter(Submission.stickied != None, Submission.is_banned == False)
|
pins = g.db.query(Submission).filter(Submission.stickied != None, Submission.is_banned == False)
|
||||||
if sub:
|
if sub:
|
||||||
pins = pins.filter_by(sub=sub.name)
|
pins = pins.filter_by(sub=sub.name)
|
||||||
|
elif not v:
|
||||||
|
pins = pins.filter(Submission.sub == None)
|
||||||
elif subs == 1:
|
elif subs == 1:
|
||||||
pins = pins.filter(or_(Submission.sub == None, Submission.sub.in_(v.subbed_subs)))
|
pins = pins.filter(or_(Submission.sub == None, Submission.sub.in_(v.subbed_subs)))
|
||||||
elif subs == 2:
|
elif subs == 2:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue