sfd
parent
a4086ffdf4
commit
45fa9af644
|
@ -295,13 +295,13 @@ 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:
|
elif not v:
|
||||||
posts = posts.filter(Submission.sub == None)
|
if subs == 1: posts = posts.filter(Submission.sub == None)
|
||||||
elif subs == 1:
|
elif v.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 v.subs == 2:
|
||||||
posts = posts.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks)))
|
posts = posts.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks)))
|
||||||
elif subs == 3:
|
elif v.subs == 3:
|
||||||
posts = posts.filter(Submission.sub != None, Submission.sub.notin_(v.all_blocks))
|
posts = posts.filter(Submission.sub != None, Submission.sub.notin_(v.all_blocks))
|
||||||
|
|
||||||
|
|
||||||
|
@ -373,12 +373,12 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false"
|
||||||
if sub:
|
if sub:
|
||||||
pins = pins.filter_by(sub=sub.name)
|
pins = pins.filter_by(sub=sub.name)
|
||||||
elif not v:
|
elif not v:
|
||||||
pins = pins.filter(Submission.sub == None)
|
if subs == 1: pins = pins.filter(Submission.sub == None)
|
||||||
elif subs == 1:
|
elif v.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 v.subs == 2:
|
||||||
pins = pins.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks)))
|
pins = pins.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks)))
|
||||||
elif subs == 3:
|
elif v.subs == 3:
|
||||||
pins = pins.filter(Submission.sub != None, Submission.sub.notin_(v.all_blocks))
|
pins = pins.filter(Submission.sub != None, Submission.sub.notin_(v.all_blocks))
|
||||||
|
|
||||||
if v and v.admin_level < 2:
|
if v and v.admin_level < 2:
|
||||||
|
|
Loading…
Reference in New Issue