mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-09 12:30:15 +02:00
Revert "Update autogroups."
This reverts commit eaa1cde01a1a73b9950161151f2d94b90fbaa6de.
This commit is contained in:
parent
7b77a6cd40
commit
a8c0db3fd7
@ -6,8 +6,6 @@ from django.core.exceptions import ObjectDoesNotExist
|
|||||||
from allianceauth.authentication.models import State
|
from allianceauth.authentication.models import State
|
||||||
from allianceauth.eveonline.models import EveCorporationInfo, EveAllianceInfo
|
from allianceauth.eveonline.models import EveCorporationInfo, EveAllianceInfo
|
||||||
|
|
||||||
from allianceauth.groupmanagement.models import AuthGroup
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
@ -181,16 +179,12 @@ class AutogroupsConfig(models.Model):
|
|||||||
@transaction.atomic
|
@transaction.atomic
|
||||||
def create_alliance_group(self, alliance: EveAllianceInfo) -> Group:
|
def create_alliance_group(self, alliance: EveAllianceInfo) -> Group:
|
||||||
group, created = Group.objects.get_or_create(name=self.get_alliance_group_name(alliance))
|
group, created = Group.objects.get_or_create(name=self.get_alliance_group_name(alliance))
|
||||||
if created:
|
|
||||||
AuthGroup.objects.create(group=group)
|
|
||||||
ManagedAllianceGroup.objects.get_or_create(group=group, config=self, alliance=alliance)
|
ManagedAllianceGroup.objects.get_or_create(group=group, config=self, alliance=alliance)
|
||||||
return group
|
return group
|
||||||
|
|
||||||
@transaction.atomic
|
@transaction.atomic
|
||||||
def create_corp_group(self, corp: EveCorporationInfo) -> Group:
|
def create_corp_group(self, corp: EveCorporationInfo) -> Group:
|
||||||
group, created = Group.objects.get_or_create(name=self.get_corp_group_name(corp))
|
group, created = Group.objects.get_or_create(name=self.get_corp_group_name(corp))
|
||||||
if created:
|
|
||||||
AuthGroup.objects.create(group=group)
|
|
||||||
ManagedCorpGroup.objects.get_or_create(group=group, config=self, corp=corp)
|
ManagedCorpGroup.objects.get_or_create(group=group, config=self, corp=corp)
|
||||||
return group
|
return group
|
||||||
|
|
||||||
@ -247,7 +241,6 @@ class ManagedGroup(models.Model):
|
|||||||
def __str__(self):
|
def __str__(self):
|
||||||
return "Managed Group: %s" % self.group.name
|
return "Managed Group: %s" % self.group.name
|
||||||
|
|
||||||
|
|
||||||
class ManagedCorpGroup(ManagedGroup):
|
class ManagedCorpGroup(ManagedGroup):
|
||||||
corp = models.ForeignKey(EveCorporationInfo, on_delete=models.CASCADE)
|
corp = models.ForeignKey(EveCorporationInfo, on_delete=models.CASCADE)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user