klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-01-08 16:11:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove Club.view_groups, Club.edit_groups and Club.owner_group

Browse Source
This commit is contained in:
imperosol 2025-01-03 17:30:24 +01:00
parent b8f851b009
commit efca10e252
3 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
club/admin.py
View File

@ -25,9 +25,6 @@ class ClubAdmin(admin.ModelAdmin):
"parent", "parent",
"board_group", "board_group",
"members_group", "members_group",
"view_groups",
"edit_groups",
"owner_group",
"home", "home",
"page", "page",
) )

16
club/migrations/0012_club_board_group_club_members_group.py
View File

@ -64,13 +64,25 @@ class Migration(migrations.Migration):
] ]
operations = [ operations = [
migrations.RemoveField(
model_name="club",
name="edit_groups",
),
migrations.RemoveField(
model_name="club",
name="owner_group",
),
migrations.RemoveField(
model_name="club",
name="view_groups",
),
migrations.AddField( migrations.AddField(
model_name="club", model_name="club",
name="board_group", name="board_group",
field=models.OneToOneField( field=models.OneToOneField(
blank=True, blank=True,
null=True, null=True,
on_delete=django.db.models.deletion.CASCADE, on_delete=django.db.models.deletion.PROTECT,
related_name="club_board", related_name="club_board",
to="core.group", to="core.group",
), ),
@ -81,7 +93,7 @@ class Migration(migrations.Migration):
field=models.OneToOneField( field=models.OneToOneField(
blank=True, blank=True,
null=True, null=True,
on_delete=django.db.models.deletion.CASCADE, on_delete=django.db.models.deletion.PROTECT,
related_name="club", related_name="club",
to="core.group", to="core.group",
), ),

29
club/models.py
View File

@ -79,19 +79,6 @@ class Club(models.Model):
_("short description"), max_length=1000, default="", blank=True, null=True _("short description"), max_length=1000, default="", blank=True, null=True
) )
address = models.CharField(_("address"), max_length=254) address = models.CharField(_("address"), max_length=254)
owner_group = models.ForeignKey(
Group,
related_name="owned_club",
default=get_default_owner_group,
on_delete=models.CASCADE,
)
edit_groups = models.ManyToManyField(
Group, related_name="editable_club", blank=True
)
view_groups = models.ManyToManyField(
Group, related_name="viewable_club", blank=True
)
home = models.OneToOneField( home = models.OneToOneField(
SithFile, SithFile,
related_name="home_of_club", related_name="home_of_club",
@ -104,10 +91,10 @@ class Club(models.Model):
Page, related_name="club", blank=True, null=True, on_delete=models.CASCADE Page, related_name="club", blank=True, null=True, on_delete=models.CASCADE
) )
members_group = models.OneToOneField( members_group = models.OneToOneField(
Group, related_name="club", on_delete=models.CASCADE Group, related_name="club", on_delete=models.PROTECT
) )
board_group = models.OneToOneField( board_group = models.OneToOneField(
Group, related_name="club_board", on_delete=models.CASCADE Group, related_name="club_board", on_delete=models.PROTECT
) )
class Meta: class Meta:
@ -131,12 +118,7 @@ class Club(models.Model):
) )
super().save(*args, **kwargs) super().save(*args, **kwargs)
if creation: if creation:
subscribers = Group.objects.filter(
name=settings.SITH_MAIN_MEMBERS_GROUP
).first()
self.make_home() self.make_home()
self.home.edit_groups.add(self.board_group)
self.home.view_groups.add(self.members_group, subscribers)
self.make_page() self.make_page()
cache.set(f"sith_club_{self.unix_name}", self) cache.set(f"sith_club_{self.unix_name}", self)
@ -209,6 +191,8 @@ class Club(models.Model):
for membership in self.members.ongoing().select_related("user"): for membership in self.members.ongoing().select_related("user"):
cache.delete(f"membership_{self.id}_{membership.user.id}") cache.delete(f"membership_{self.id}_{membership.user.id}")
cache.delete(f"sith_club_{self.unix_name}") cache.delete(f"sith_club_{self.unix_name}")
self.board_group.delete()
self.members_group.delete()
return super().delete(*args, **kwargs) return super().delete(*args, **kwargs)
def get_display_name(self) -> str: def get_display_name(self) -> str:
@ -218,7 +202,7 @@ class Club(models.Model):
"""Method to see if that object can be super edited by the given user.""" """Method to see if that object can be super edited by the given user."""
if user.is_anonymous: if user.is_anonymous:
return False return False
return user.is_board_member return user.is_root or user.is_board_member
def get_full_logo_url(self) -> str: def get_full_logo_url(self) -> str:
return f"https://{settings.SITH_URL}{self.logo.url}" return f"https://{settings.SITH_URL}{self.logo.url}"
@ -251,8 +235,7 @@ class Club(models.Model):
return membership return membership
def has_rights_in_club(self, user: User) -> bool: def has_rights_in_club(self, user: User) -> bool:
m = self.get_membership_for(user) return user.is_in_group(pk=self.board_group_id)
return m is not None and m.role > settings.SITH_MAXIMUM_FREE_ROLE
class MembershipQuerySet(models.QuerySet): class MembershipQuerySet(models.QuerySet):