Skip to content

Commit f8680a0

Browse files
committed
allow anonymous users to view groups w/out error
1 parent 537a5dd commit f8680a0

1 file changed

Lines changed: 24 additions & 14 deletions

File tree

mapgroups/views.py

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -87,20 +87,30 @@ def get_context_data(self, request, **kwargs):
8787

8888
pg = self.object.permission_group
8989
shared_items = {}
90-
shared_items['bookmarks'] = pg.visualize_bookmark_related.all().annotate(
91-
is_owner=Case(
92-
When(
93-
user=request.user, then=True
94-
),
95-
default=False,
96-
output_field=BooleanField()
97-
)
98-
).order_by('-is_owner','name','user')
99-
shared_items['scenarios'] = pg.scenarios_scenario_related.all().annotate(is_owner=Case(When(user=request.user, then=True), default=False, output_field=BooleanField())).order_by('-is_owner','name','user')
100-
shared_items['leaseblock_selections'] = pg.scenarios_leaseblockselection_related.all().annotate(is_owner=Case(When(user=request.user, then=True), default=False, output_field=BooleanField())).order_by('-is_owner','name','user')
101-
shared_items['drawings'] = pg.drawing_aoi_related.all().annotate(is_owner=Case(When(user=request.user, then=True), default=False, output_field=BooleanField())).order_by('-is_owner','name','user')
102-
shared_items['windenergysites'] = pg.drawing_windenergysite_related.all().annotate(is_owner=Case(When(user=request.user, then=True), default=False, output_field=BooleanField())).order_by('-is_owner','name','user')
103-
shared_items['user_imported_layers'] = pg.visualize_userlayer_related.all().annotate(is_owner=Case(When(user=request.user, then=True), default=False, output_field=BooleanField())).order_by('-is_owner','name','user')
90+
91+
if request.user.is_anonymous:
92+
# When(user=None, then=False),
93+
shared_items['bookmarks'] = pg.visualize_bookmark_related.all().annotate(is_owner=Case(default=False, output_field=BooleanField())).order_by('name','user')
94+
shared_items['scenarios'] = pg.scenarios_scenario_related.all().annotate(is_owner=Case(default=False, output_field=BooleanField())).order_by('name','user')
95+
shared_items['leaseblock_selections'] = pg.drawing_aoi_related.all().annotate(is_owner=Case(default=False, output_field=BooleanField())).order_by('name','user')
96+
shared_items['drawings'] = pg.drawing_windenergysite_related.all().annotate(is_owner=Case(default=False, output_field=BooleanField())).order_by('name','user')
97+
shared_items['windenergysites'] = pg.drawing_windenergysite_related.all().annotate(is_owner=Case(default=False, output_field=BooleanField())).order_by('name','user')
98+
shared_items['user_imported_layers'] = pg.visualize_userlayer_related.all().annotate(is_owner=Case(default=False, output_field=BooleanField())).order_by('name','user')
99+
else:
100+
shared_items['bookmarks'] = pg.visualize_bookmark_related.all().annotate(
101+
is_owner=Case(
102+
When(
103+
user=request.user, then=True
104+
),
105+
default=False,
106+
output_field=BooleanField()
107+
)
108+
).order_by('-is_owner','name','user')
109+
shared_items['scenarios'] = pg.scenarios_scenario_related.all().annotate(is_owner=Case(When(user=request.user, then=True), default=False, output_field=BooleanField())).order_by('-is_owner','name','user')
110+
shared_items['leaseblock_selections'] = pg.scenarios_leaseblockselection_related.all().annotate(is_owner=Case(When(user=request.user, then=True), default=False, output_field=BooleanField())).order_by('-is_owner','name','user')
111+
shared_items['drawings'] = pg.drawing_aoi_related.all().annotate(is_owner=Case(When(user=request.user, then=True), default=False, output_field=BooleanField())).order_by('-is_owner','name','user')
112+
shared_items['windenergysites'] = pg.drawing_windenergysite_related.all().annotate(is_owner=Case(When(user=request.user, then=True), default=False, output_field=BooleanField())).order_by('-is_owner','name','user')
113+
shared_items['user_imported_layers'] = pg.visualize_userlayer_related.all().annotate(is_owner=Case(When(user=request.user, then=True), default=False, output_field=BooleanField())).order_by('-is_owner','name','user')
104114

105115
if any(shared_items.values()):
106116
context['shared_items'] = shared_items

0 commit comments

Comments
 (0)