From 2db56a0e289d7667ce2a7d0f8c4b39908f6fe388 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Mon, 20 Dec 2010 12:43:25 +0000 Subject: [PATCH] fixed GroupInformation creation --- groups/models.py | 2 +- groups/views.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/groups/models.py b/groups/models.py index e1d5a5c..35ac41b 100644 --- a/groups/models.py +++ b/groups/models.py @@ -19,7 +19,7 @@ class GroupInformation(models.Model): def save(self, *args, **kwargs): if self.group and (self.group.eveplayercorporation_set.count() or self.group.eveplayeralliance_set.count()): self.type = GROUP_TYPE_MANAGED - models.Model.save(*args, **kwargs) + models.Model.save(self, *args, **kwargs) @staticmethod def create_group(sender, instance, created, **kwargs): diff --git a/groups/views.py b/groups/views.py index 8ab0113..52c439c 100644 --- a/groups/views.py +++ b/groups/views.py @@ -31,16 +31,16 @@ def group_list(request): for group in set(groups): if not group.groupinformation: - GroupInformation(group=group).save() + g, c = GroupInformation.objects.get_or_create(group=group) - if request.user in group.groupinformation.admins.all(): + if group.groupinformation and request.user in group.groupinformation.admins.all(): status = "Admin" elif request.user in group.user_set.all(): status = "Member" else: status = None - if group.groupinformation.requestable and not group.groupinformation.type == GROUP_TYPE_MANAGED: + if group.groupinformation and group.groupinformation.requestable and not group.groupinformation.type == GROUP_TYPE_MANAGED: requestable = True else: requestable = False