Skip to content

Commit 470187e

Browse files
Remove the old pages system (#4814)
Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com> Co-authored-by: Marco Acierno <3382153+marcoacierno@users.noreply.github.com>
1 parent 591729f commit 470187e

24 files changed

Lines changed: 30 additions & 461 deletions

File tree

backend/api/cms/types.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import strawberry
22
import strawberry_django
33

4-
from api.pages.types import Page
54
from cms import models
65

76
from ..helpers.i18n import make_localized_resolver
@@ -23,7 +22,6 @@ class MenuLink:
2322
resolver=make_localized_resolver("title"), only=["title"]
2423
)
2524
is_primary: strawberry.auto
26-
page: Page | None
2725

2826

2927
@strawberry_django.type(models.Menu)

backend/api/pages/__init__.py

Whitespace-only changes.

backend/api/pages/schema.py

Lines changed: 0 additions & 24 deletions
This file was deleted.

backend/api/pages/types.py

Lines changed: 0 additions & 25 deletions
This file was deleted.

backend/api/schema.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
from .newsletters.schema import NewsletterMutations
1313
from .orders.mutations import OrdersMutations
1414
from .orders.query import OrdersQuery
15-
from .pages.schema import PagesQuery
1615
from .pretix.mutations import AttendeeTicketMutation
1716
from .schedule.schema import ScheduleQuery, ScheduleMutations
1817
from .submissions.mutations import SubmissionsMutations
@@ -34,7 +33,6 @@
3433
class Query(
3534
ConferenceQuery,
3635
SubmissionsQuery,
37-
PagesQuery,
3836
CountryQuery,
3937
OrdersQuery,
4038
JobBoardQuery,

backend/api/tests/schema/conference/test_menu.py

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
from cms.tests.factories import MenuFactory, MenuLinkFactory
44
from conferences.tests.factories import ConferenceFactory
5-
from pages.tests.factories import PageFactory
65

76

87
@mark.django_db
@@ -68,10 +67,7 @@ def test_frontend_header_menus_query_is_constant(
6867
for identifier in ["conference-nav", "program-nav"]:
6968
menu = MenuFactory(identifier=identifier, conference=conference)
7069
for _ in range(link_count):
71-
MenuLinkFactory(
72-
menu=menu,
73-
page=PageFactory(conference=conference),
74-
)
70+
MenuLinkFactory(menu=menu)
7571

7672
with django_assert_num_queries(9):
7773
resp = graphql_client.query(
@@ -83,36 +79,24 @@ def test_frontend_header_menus_query_is_constant(
8379
links {
8480
text: title(language: "en")
8581
link: href(language: "en")
86-
page {
87-
slug(language: "en")
88-
}
8982
}
9083
}
9184
programMenuEn: menu(identifier: "program-nav") {
9285
links {
9386
text: title(language: "en")
9487
link: href(language: "en")
95-
page {
96-
slug(language: "en")
97-
}
9888
}
9989
}
10090
conferenceMenuIt: menu(identifier: "conference-nav") {
10191
links {
10292
text: title(language: "it")
10393
link: href(language: "it")
104-
page {
105-
slug(language: "it")
106-
}
10794
}
10895
}
10996
programMenuIt: menu(identifier: "program-nav") {
11097
links {
11198
text: title(language: "it")
11299
link: href(language: "it")
113-
page {
114-
slug(language: "it")
115-
}
116100
}
117101
}
118102
}

backend/api/tests/schema/test_pages.py

Lines changed: 0 additions & 158 deletions
This file was deleted.

backend/cms/migrations/0006_menu_menulink.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ class Migration(migrations.Migration):
1111

1212
dependencies = [
1313
('conferences', '0011_auto_20190921_2340'),
14-
('pages', '0002_auto_20190914_1504'),
1514
('cms', '0005_faq'),
1615
]
1716

@@ -39,7 +38,6 @@ class Migration(migrations.Migration):
3938
('title', i18n.fields.I18nTextField(verbose_name='title')),
4039
('href', i18n.fields.I18nTextField(blank=True, verbose_name='Link url')),
4140
('menu', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='links', to='cms.Menu', verbose_name='menu')),
42-
('page', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='links', to='pages.Page', verbose_name='page')),
4341
],
4442
options={
4543
'ordering': ('order',),
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
from django.db import migrations
2+
3+
4+
class Migration(migrations.Migration):
5+
dependencies = [
6+
('cms', '0008_menu_title'),
7+
]
8+
9+
# The old pages app has been removed: 0006_menu_menulink no longer creates
10+
# the menulink.page column, so there is no state to change here, only the
11+
# leftover database objects of already migrated databases to clean up.
12+
operations = [
13+
migrations.RunSQL(
14+
'ALTER TABLE cms_menulink DROP COLUMN IF EXISTS page_id;',
15+
migrations.RunSQL.noop,
16+
),
17+
migrations.RunSQL(
18+
'DROP TABLE IF EXISTS pages_page;',
19+
migrations.RunSQL.noop,
20+
),
21+
migrations.RunSQL(
22+
"DELETE FROM django_migrations WHERE app = 'pages';",
23+
migrations.RunSQL.noop,
24+
),
25+
]

backend/cms/models.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@ class MenuLink(OrderedModel, TimeStampedModel):
6767
title = I18nTextField(_("title"), blank=False)
6868
href = I18nTextField(_("Link url"), blank=True)
6969
is_primary = models.BooleanField(_("Is primary"), default=False)
70-
page = models.ForeignKey(
71-
"pages.Page",
72-
on_delete=models.CASCADE,
73-
verbose_name=_("page"),
74-
related_name="links",
75-
null=True,
76-
blank=True,
77-
)
7870

7971
def __str__(self):
8072
return f"{self.title} ({self.menu})"

0 commit comments

Comments
 (0)