Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

correct mixins path #1

Merged
merged 2 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pretalx_pages/migrations/0001_create_page_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import i18nfield.fields
from django.db import migrations, models

import pretalx.common.models.mixins
import pretalx.common.mixins.models


class Migration(migrations.Migration):
Expand Down Expand Up @@ -54,6 +54,6 @@ class Migration(migrations.Migration):
options={
"ordering": ["position", "title"],
},
bases=(pretalx.common.models.mixins.LogMixin, models.Model),
bases=(pretalx.common.mixins.models.LogMixin, models.Model),
),
]
4 changes: 2 additions & 2 deletions pretalx_pages/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from django.db import models
from django.utils.translation import gettext_lazy as _
from i18nfield.fields import I18nCharField, I18nTextField
from pretalx.common.models.mixins import LogMixin
from pretalx.common.text.phrases import phrases
from pretalx.common.mixins.models import LogMixin
from pretalx.common.phrases import phrases
from pretalx.event.models import Event


Expand Down
2 changes: 1 addition & 1 deletion pretalx_pages/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
UpdateView,
)
from i18nfield.forms import I18nModelForm
from pretalx.common.mixins.views import EventPermissionRequired
from pretalx.common.templatetags.rich_text import (
ALLOWED_ATTRIBUTES,
ALLOWED_PROTOCOLS,
ALLOWED_TAGS,
md,
)
from pretalx.common.views.mixins import EventPermissionRequired

from .models import Page

Expand Down
Loading