Merge branch 'cherry-pick-fbdc5dea' into 'release/1.13'

Cherry pick 'fix/566-photos-unavailable' into 'release/1.13'

See merge request !716

website/photos/api/viewsets.py

@@ -14,8 +14,8 @@ class AlbumsViewSet(ModelViewSet):
     queryset = Album.objects.all()
 
     def get_queryset(self):
-        return services.annotate_accessible_albums(self.request,
-                                                   Album.objects.all())
+        return services.get_annotated_accessible_albums(self.request,
+                                                        Album.objects.all())
 
     def create(self, request, *args, **kwargs):
         if self.request.user.has_perm('photos.create_album'):

website/photos/services.py

@@ -18,7 +18,7 @@ def is_album_accessible(request, album):
 
 
 # Annotate the albums which are accessible by the user
-def annotate_accessible_albums(request, albums):
+def get_annotated_accessible_albums(request, albums):
     if request.member and request.member.current_membership is None:
         # The user is currently not a member
         # so only show photos that were made during their membership
@@ -49,4 +49,4 @@ def can_view_album(request, album):
         filter = Q(since__lte=album.date) & (Q(until__gte=album.date) |
                                              Q(until=None))
         return request.member.membership_set.filter(filter).count() > 0
-    return False
+    return True

website/photos/views.py

@@ -22,7 +22,7 @@ def index(request):
     # Only show published albums
     albums = Album.objects.filter(hidden=False)
 
-    services.annotate_accessible_albums(request, albums)
+    albums = services.get_annotated_accessible_albums(request, albums)
 
     albums = albums.order_by('-date')
     paginator = Paginator(albums, 12)