mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-10 13:00:16 +02:00
Merge branch 'auto-group' into 'master'
Fix Autogroups, Add Autogroups to admin Closes #1087 See merge request allianceauth/allianceauth!1133
This commit is contained in:
commit
fc3d7e9f43
@ -1,6 +1,6 @@
|
|||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from .models import AutogroupsConfig
|
from .models import AutogroupsConfig, ManagedCorpGroup, ManagedAllianceGroup
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
@ -37,3 +37,6 @@ class AutogroupsConfigAdmin(admin.ModelAdmin):
|
|||||||
|
|
||||||
|
|
||||||
admin.site.register(AutogroupsConfig, AutogroupsConfigAdmin)
|
admin.site.register(AutogroupsConfig, AutogroupsConfigAdmin)
|
||||||
|
admin.site.register(ManagedCorpGroup)
|
||||||
|
admin.site.register(ManagedAllianceGroup)
|
||||||
|
|
||||||
|
@ -179,15 +179,13 @@ 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:
|
ManagedAllianceGroup.objects.get_or_create(group=group, config=self, alliance=alliance)
|
||||||
ManagedAllianceGroup.objects.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:
|
ManagedCorpGroup.objects.get_or_create(group=group, config=self, corp=corp)
|
||||||
ManagedCorpGroup.objects.create(group=group, config=self, corp=corp)
|
|
||||||
return group
|
return group
|
||||||
|
|
||||||
def delete_alliance_managed_groups(self):
|
def delete_alliance_managed_groups(self):
|
||||||
@ -240,6 +238,8 @@ class ManagedGroup(models.Model):
|
|||||||
class Meta:
|
class Meta:
|
||||||
abstract = True
|
abstract = True
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
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