[FIXES GeoNode#5639] Group membership is ignored for layer permissions

Author: sjohn-atenekom

AUTHORS

@@ -86,8 +86,8 @@ John Jediny (nepanode)
 Guillermo Solano (gsolat)
 Jorge Martinez (JorgeMartinezG)
 Wayner Barrios (waybarrios)
+Steffen Berger (sjohn-atenekom)
 @gioscarda
-@sjohn-atenekom
 @LiliGuimaraes
 @kikislater
 @mtnorthcott

geonode/groups/models.py

@@ -199,9 +199,7 @@ def join(self, user, **kwargs):
         if user == user.get_anonymous():
             raise ValueError("The invited user cannot be anonymous")
         member, created = GroupMember.objects.get_or_create(group=self, user=user, defaults=kwargs)
-        if created:
-            user.groups.add(self.group)
-        else:
+        if not created:
             logger.warning("The invited user \"{0}\" is already a member".format(user.username))
 
     def leave(self, user, **kwargs):
@@ -246,6 +244,15 @@ class GroupMember(models.Model):
     ])
     joined = models.DateTimeField(default=now)
 
+    def save(self, *args, **kwargs):
+        # add django.contrib.auth.group to user
+        self.user.groups.add(self.group.group)
+        super(GroupMember, self).save(*args, **kwargs)
+
+    def delete(self, *args, **kwargs):
+        self.user.groups.remove(self.group.group)
+        super(GroupMember, self).delete(*args, **kwargs)
+
 
 def group_pre_delete(instance, sender, **kwargs):
     """Make sure that the anonymous group is not deleted"""

geonode/groups/views.py

@@ -199,7 +199,6 @@ def group_member_remove(request, slug, username):
         return HttpResponseForbidden()
     else:
         GroupMember.objects.get(group=group, user=user).delete()
-        user.groups.remove(group.group)
         return redirect("group_detail", slug=group.slug)