mirror of
https://gitlab.com/tildes/tildes.git
synced 2026-04-16 06:18:34 +02:00
Fix groups with subgroups for logged-out viewers
This commit is contained in:
@@ -108,7 +108,7 @@
|
||||
{% set is_single_group = False %}
|
||||
{% endif %}
|
||||
|
||||
{% if is_single_group and subgroups %}
|
||||
{% if request.user and is_single_group and subgroups %}
|
||||
<div class="topic-listing-filter">
|
||||
{% if all_subgroups %}
|
||||
Includes topics from all subgroups.
|
||||
|
||||
@@ -178,14 +178,20 @@ def get_group_topics( # noqa
|
||||
group for group in request.query(Group).all() if group.path != "test"
|
||||
]
|
||||
subgroups = None
|
||||
include_subgroups = False
|
||||
else:
|
||||
# otherwise, just topics from the single group that we're looking at
|
||||
groups = [request.context]
|
||||
|
||||
groups.extend([
|
||||
sub.group for sub in request.user.subscriptions
|
||||
if sub.group.is_subgroup_of(request.context)
|
||||
])
|
||||
if request.user:
|
||||
groups.extend([
|
||||
sub.group for sub in request.user.subscriptions
|
||||
if sub.group.is_subgroup_of(request.context)
|
||||
])
|
||||
|
||||
include_subgroups = all_subgroups
|
||||
else:
|
||||
include_subgroups = True
|
||||
|
||||
subgroups = (
|
||||
request.query(Group)
|
||||
@@ -214,9 +220,7 @@ def get_group_topics( # noqa
|
||||
query = (
|
||||
request.query(Topic)
|
||||
.join_all_relationships()
|
||||
.inside_groups(
|
||||
groups, include_subgroups=not is_home_page and all_subgroups
|
||||
)
|
||||
.inside_groups(groups, include_subgroups=include_subgroups)
|
||||
.exclude_ignored()
|
||||
.apply_sort_option(order)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user