Merge branch 'com' into 'master'

com: fix error 500 when editing poster with com admin

See merge request ae/Sith!242

com/views.py

@@ -739,8 +739,7 @@ class PosterEditBaseView(UpdateView):
 
     def get_context_data(self, **kwargs):
         kwargs = super(PosterEditBaseView, self).get_context_data(**kwargs)
-        if not self.request.user.is_com_admin:
-            kwargs["club"] = self.club
+        kwargs["club"] = kwargs.get("club", self.club)
         return kwargs
 
     def form_valid(self, form):