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

Merge branch '21-adapt-to-core-4-0' into 'master'

Resolve "Adapt to Core 4.0"

Closes #21

See merge request !38
parents f43442cb e1f76548
No related branches found
No related tags found
1 merge request!38Resolve "Adapt to Core 4.0"
Pipeline #139913 failed
# Generated by Django 3.2.12 on 2022-03-06 21:33 # Generated by Django 3.2.12 on 2022-03-06 21:33
import aleksis.core.mixins import aleksis.core.mixins
import django.contrib.sites.managers import aleksis.core.managers
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
...@@ -25,7 +25,7 @@ class Migration(migrations.Migration): ...@@ -25,7 +25,7 @@ class Migration(migrations.Migration):
('site', models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.site')), ('site', models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.site')),
], ],
managers=[ managers=[
('objects', django.contrib.sites.managers.CurrentSiteManager()), ('objects', aleksis.core.managers.AlekSISBaseManager()),
], ],
), ),
migrations.CreateModel( migrations.CreateModel(
...@@ -39,7 +39,7 @@ class Migration(migrations.Migration): ...@@ -39,7 +39,7 @@ class Migration(migrations.Migration):
('site', models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.site')), ('site', models.ForeignKey(default=1, editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.site')),
], ],
managers=[ managers=[
('objects', django.contrib.sites.managers.CurrentSiteManager()), ('objects', aleksis.core.managers.AlekSISBaseManager()),
], ],
), ),
migrations.CreateModel( migrations.CreateModel(
......
# Generated by Django 3.2.12 on 2022-03-12 21:41 # Generated by Django 3.2.12 on 2022-03-12 21:41
import django.contrib.sites.managers import aleksis.core.managers
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
...@@ -29,7 +29,7 @@ class Migration(migrations.Migration): ...@@ -29,7 +29,7 @@ class Migration(migrations.Migration):
'abstract': False, 'abstract': False,
}, },
managers=[ managers=[
('objects', django.contrib.sites.managers.CurrentSiteManager()), ('objects', aleksis.core.managers.AlekSISBaseManager()),
], ],
), ),
migrations.AddField( migrations.AddField(
......
...@@ -39,7 +39,7 @@ def configure_clients(apps, schema_editor): ...@@ -39,7 +39,7 @@ def configure_clients(apps, schema_editor):
values[f"{variant}_enabled"] = False values[f"{variant}_enabled"] = False
warnings.warn(f"Payment variant {variant} enabled but {field.name} not configured!") warnings.warn(f"Payment variant {variant} enabled but {field.name} not configured!")
Client.objects.update(**values) Client._base_manager.update(**values)
class Migration(migrations.Migration): class Migration(migrations.Migration):
......
# Generated by Django 4.2.3 on 2023-07-22 15:41
import aleksis.core.managers
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('sites', '0002_alter_domain_unique'),
('tezor', '0009_invoice_billing_phone'),
]
operations = [
migrations.AddField(
model_name='client',
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='invoicegroup',
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='invoiceitem',
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'),
),
]
...@@ -131,10 +131,10 @@ class ClientDetailView(PermissionRequiredMixin, DetailView): ...@@ -131,10 +131,10 @@ class ClientDetailView(PermissionRequiredMixin, DetailView):
permission_required = "tezor.view_client_rule" permission_required = "tezor.view_client_rule"
template_name = "tezor/client/full.html" template_name = "tezor/client/full.html"
def get_context_data(self, obj): def get_context_data(self, object):
context = super().get_context_data() context = super().get_context_data()
invoice_groups = obj.invoice_groups.all() invoice_groups = object.invoice_groups.all()
invoice_groups_table = InvoiceGroupsTable(invoice_groups) invoice_groups_table = InvoiceGroupsTable(invoice_groups)
RequestConfig(self.request).configure(invoice_groups_table) RequestConfig(self.request).configure(invoice_groups_table)
context["invoice_groups_table"] = invoice_groups_table context["invoice_groups_table"] = invoice_groups_table
...@@ -156,10 +156,10 @@ class InvoiceGroupDetailView(PermissionRequiredMixin, DetailView): ...@@ -156,10 +156,10 @@ class InvoiceGroupDetailView(PermissionRequiredMixin, DetailView):
self.invoices_action_form.execute() self.invoices_action_form.execute()
return r return r
def get_context_data(self, obj): def get_context_data(self, object):
context = super().get_context_data() context = super().get_context_data()
qs = obj.invoices.all() qs = object.invoices.all()
invoices_filter = InvoicesFilter(self.request.GET, qs) invoices_filter = InvoicesFilter(self.request.GET, qs)
context["filter"] = invoices_filter context["filter"] = invoices_filter
......
[tool.poetry] [tool.poetry]
name = "AlekSIS-App-Tezor" name = "AlekSIS-App-Tezor"
version = "1.2.1.dev0" version = "2.0.dev0"
packages = [ packages = [
{ include = "aleksis" } { include = "aleksis" }
] ]
...@@ -34,7 +34,7 @@ url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple" ...@@ -34,7 +34,7 @@ url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
priority = "supplemental" priority = "supplemental"
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^3.9" python = "^3.9"
aleksis-core = "^3.0" aleksis-core = "^4.0.0.dev0"
django-payments = { version = "^1.0.0", extras = ["sofort"] } django-payments = { version = "^1.0.0", extras = ["sofort"] }
django-payments-sepa = "^1.0.1" django-payments-sepa = "^1.0.1"
......
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