Skip to content
Snippets Groups Projects
Commit d7a5c6c8 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch '11-adapt-to-aleksis-core-4-0' into 'master'

Resolve "Adapt to AlekSIS-Core 4.0"

Closes #11

See merge request !21
parents 16036068 cad49ae0
No related branches found
No related tags found
1 merge request!21Resolve "Adapt to AlekSIS-Core 4.0"
Pipeline #141051 failed
# Generated by Django 3.2.11 on 2022-01-19 21:25
import django.contrib.sites.managers
from django.db import migrations, models
import django.db.models.deletion
import aleksis.core.managers
class Migration(migrations.Migration):
......@@ -30,7 +31,7 @@ class Migration(migrations.Migration):
'verbose_name_plural': 'Mail addresses',
},
managers=[
('objects', django.contrib.sites.managers.CurrentSiteManager()),
('objects', aleksis.core.managers.AlekSISBaseManager()),
],
),
migrations.AddConstraint(
......
# Generated by Django 3.2.12 on 2022-02-01 18:47
import django.contrib.sites.managers
from django.db import migrations, models
import django.db.models.deletion
import aleksis.core.managers
class Migration(migrations.Migration):
......@@ -27,7 +28,7 @@ class Migration(migrations.Migration):
'abstract': False,
},
managers=[
('objects', django.contrib.sites.managers.CurrentSiteManager()),
('objects', aleksis.core.managers.AlekSISBaseManager()),
],
),
migrations.AlterField(
......
# Generated by Django 4.2.3 on 2023-07-22 11:05
import aleksis.core.managers
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('contenttypes', '0002_remove_content_type_name'),
('sites', '0002_alter_domain_unique'),
('postbuero', '0005_group_address'),
]
operations = [
migrations.AddField(
model_name='mailaddress',
name='managed_by_app_label',
field=models.CharField(blank=True, editable=False, max_length=255, verbose_name='App label of app responsible for managing this instance'),
),
migrations.AddField(
model_name='mailalias',
name='managed_by_app_label',
field=models.CharField(blank=True, editable=False, max_length=255, verbose_name='App label of app responsible for managing this instance'),
),
migrations.AddField(
model_name='maildomain',
name='managed_by_app_label',
field=models.CharField(blank=True, editable=False, max_length=255, verbose_name='App label of app responsible for managing this instance'),
),
]
......@@ -37,6 +37,7 @@ class MailAddressCreateMutation(DjangoCreateMutation):
class Meta:
model = MailAddress
permissions = ("postbuero.create_mailaddress",)
exclude_fields = ("managed_by_app_label",)
@classmethod
def before_save(cls, root, info, input, obj): # noqa
......@@ -89,6 +90,7 @@ class MailDomainCreateMutation(DjangoCreateMutation):
class Meta:
model = MailDomain
permissions = ("postbuero.create_maildomain",)
exclude_fields = ("managed_by_app_label",)
class MailDomainDeleteMutation(DeleteMutation):
......@@ -99,7 +101,7 @@ class MailDomainDeleteMutation(DeleteMutation):
class MailDomainBatchPatchMutation(PermissionBatchPatchMixin, DjangoBatchPatchMutation):
class Meta:
model = MailDomain
permissions = "postbuero.change_maildomain"
permissions = ("postbuero.change_maildomain",)
class Query(graphene.ObjectType):
......
[tool.poetry]
name = "AlekSIS-App-Postbuero"
version = "2.0b0"
version = "3.0.dev0"
packages = [
{ include = "aleksis" }
]
......@@ -25,7 +25,7 @@ secondary = true
[tool.poetry.dependencies]
python = "^3.9"
AlekSIS-Core = "^3.0b0"
AlekSIS-Core = "^4.0.0.dev0"
[tool.poetry.dev-dependencies]
aleksis-builddeps = "*"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment