From 23a8b65ce264006f5ac289b5963623230dd29a81 Mon Sep 17 00:00:00 2001 From: Aaron Kable Date: Thu, 22 Aug 2019 20:35:43 -0400 Subject: [PATCH] Fix Autogroups, Add Autogroups to admin --- allianceauth/eveonline/autogroups/admin.py | 5 ++++- allianceauth/eveonline/autogroups/models.py | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/allianceauth/eveonline/autogroups/admin.py b/allianceauth/eveonline/autogroups/admin.py index 9c1a58d3..f06af858 100644 --- a/allianceauth/eveonline/autogroups/admin.py +++ b/allianceauth/eveonline/autogroups/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin from django.db import models -from .models import AutogroupsConfig +from .models import AutogroupsConfig, ManagedCorpGroup, ManagedAllianceGroup import logging @@ -37,3 +37,6 @@ class AutogroupsConfigAdmin(admin.ModelAdmin): admin.site.register(AutogroupsConfig, AutogroupsConfigAdmin) +admin.site.register(ManagedCorpGroup) +admin.site.register(ManagedAllianceGroup) + diff --git a/allianceauth/eveonline/autogroups/models.py b/allianceauth/eveonline/autogroups/models.py index 9c9196c4..23b7bf23 100644 --- a/allianceauth/eveonline/autogroups/models.py +++ b/allianceauth/eveonline/autogroups/models.py @@ -179,15 +179,13 @@ class AutogroupsConfig(models.Model): @transaction.atomic def create_alliance_group(self, alliance: EveAllianceInfo) -> Group: group, created = Group.objects.get_or_create(name=self.get_alliance_group_name(alliance)) - if created: - ManagedAllianceGroup.objects.create(group=group, config=self, alliance=alliance) + ManagedAllianceGroup.objects.get_or_create(group=group, config=self, alliance=alliance) return group @transaction.atomic def create_corp_group(self, corp: EveCorporationInfo) -> Group: group, created = Group.objects.get_or_create(name=self.get_corp_group_name(corp)) - if created: - ManagedCorpGroup.objects.create(group=group, config=self, corp=corp) + ManagedCorpGroup.objects.get_or_create(group=group, config=self, corp=corp) return group def delete_alliance_managed_groups(self): @@ -240,6 +238,8 @@ class ManagedGroup(models.Model): class Meta: abstract = True + def __str__(self): + return "Managed Group: %s" % self.group.name class ManagedCorpGroup(ManagedGroup): corp = models.ForeignKey(EveCorporationInfo, on_delete=models.CASCADE)