Skip to content

Commit fc4e00e

Browse files
matthiaskmatthiask
committed
Update the example for the newest beta of feincms3
1 parent 3253ec5 commit fc4e00e

File tree

7 files changed

+159
-171
lines changed

7 files changed

+159
-171
lines changed

‎app/articles/migrations/0001_initial.py‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# -*- coding: utf-8 -*-
2-
# Generated by Django 1.9.7 on 2016-06-25 11:25
3-
from __future__ import unicode_literals
1+
# Generated by Django 3.1.7 on 2021-03-12 10:06
42

53
import django.db.models.deletion
64
import django.utils.timezone
@@ -59,9 +57,9 @@ class Migration(migrations.Migration):
5957
],
6058
options={
6159
"verbose_name": "article",
60+
"verbose_name_plural": "articles",
6261
"ordering": ["-publication_date"],
6362
"get_latest_by": "publication_date",
64-
"verbose_name_plural": "articles",
6563
},
6664
),
6765
migrations.CreateModel(
@@ -111,6 +109,15 @@ class Migration(migrations.Migration):
111109
verbose_name="primary point of interest",
112110
),
113111
),
112+
(
113+
"alternative_text",
114+
models.CharField(
115+
blank=True,
116+
help_text="Describe the contents, e.g. for screenreaders.",
117+
max_length=200,
118+
verbose_name="alternative text",
119+
),
120+
),
114121
(
115122
"caption",
116123
models.CharField(
@@ -122,15 +129,15 @@ class Migration(migrations.Migration):
122129
models.ForeignKey(
123130
on_delete=django.db.models.deletion.CASCADE,
124131
related_name="images",
125-
to="articles.Article",
132+
to="articles.article",
126133
verbose_name="article",
127134
),
128135
),
129136
],
130137
options={
131138
"verbose_name": "image",
132-
"abstract": False,
133139
"verbose_name_plural": "images",
140+
"abstract": False,
134141
},
135142
),
136143
]

‎app/pages/admin.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ class PageAdmin(ContentEditor, TreeAdmin):
1919
"is_active",
2020
"menu",
2121
"language_code",
22-
"template_key",
23-
"application",
22+
"page_type",
2423
]
2524
list_filter = ["is_active", "menu"]
2625
list_editable = ["is_active"]
@@ -31,8 +30,7 @@ class PageAdmin(ContentEditor, TreeAdmin):
3130
radio_fields = {
3231
"menu": admin.HORIZONTAL,
3332
"language_code": admin.HORIZONTAL,
34-
"template_key": admin.HORIZONTAL,
35-
"application": admin.HORIZONTAL,
33+
"page_type": admin.HORIZONTAL,
3634
}
3735
raw_id_fields = ["parent"]
3836

@@ -66,8 +64,7 @@ class PageAdmin(ContentEditor, TreeAdmin):
6664
"fields": (
6765
"menu",
6866
"language_code",
69-
"template_key",
70-
"application",
67+
"page_type",
7168
),
7269
"classes": ("tabbed",),
7370
},

‎app/pages/migrations/0001_initial.py‎

Lines changed: 102 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
# -*- coding: utf-8 -*-
2-
# Generated by Django 1.10.6 on 2017-03-16 14:32
3-
from __future__ import unicode_literals
1+
# Generated by Django 3.1.7 on 2021-03-12 10:06
42

53
import django.core.validators
64
import django.db.models.deletion
@@ -16,68 +14,6 @@ class Migration(migrations.Migration):
1614
dependencies = []
1715

1816
operations = [
19-
migrations.CreateModel(
20-
name="Image",
21-
fields=[
22-
(
23-
"id",
24-
models.AutoField(
25-
auto_created=True,
26-
primary_key=True,
27-
serialize=False,
28-
verbose_name="ID",
29-
),
30-
),
31-
(
32-
"image",
33-
imagefield.fields.ImageField(
34-
height_field="height",
35-
upload_to="images/%Y/%m",
36-
verbose_name="image",
37-
width_field="width",
38-
),
39-
),
40-
(
41-
"width",
42-
models.PositiveIntegerField(
43-
blank=True,
44-
editable=False,
45-
null=True,
46-
verbose_name="image width",
47-
),
48-
),
49-
(
50-
"height",
51-
models.PositiveIntegerField(
52-
blank=True,
53-
editable=False,
54-
null=True,
55-
verbose_name="image height",
56-
),
57-
),
58-
(
59-
"ppoi",
60-
imagefield.fields.PPOIField(
61-
default="0.5x0.5",
62-
max_length=20,
63-
verbose_name="primary point of interest",
64-
),
65-
),
66-
("region", models.CharField(max_length=255)),
67-
("ordering", models.IntegerField(default=0)),
68-
(
69-
"caption",
70-
models.CharField(
71-
blank=True, max_length=200, verbose_name="caption"
72-
),
73-
),
74-
],
75-
options={
76-
"verbose_name": "image",
77-
"verbose_name_plural": "images",
78-
"abstract": False,
79-
},
80-
),
8117
migrations.CreateModel(
8218
name="Page",
8319
fields=[
@@ -91,17 +27,23 @@ class Migration(migrations.Migration):
9127
),
9228
),
9329
(
94-
"application",
30+
"page_type",
9531
models.CharField(
96-
blank=True,
97-
choices=[("publications", "publications"), ("blog", "blog")],
32+
choices=[
33+
("standard", "standard"),
34+
("with-sidebar", "with sidebar"),
35+
("publications", "publications"),
36+
("blog", "blog"),
37+
],
38+
default="standard",
9839
max_length=20,
99-
verbose_name="application",
40+
verbose_name="page type",
10041
),
10142
),
10243
(
103-
"app_instance_namespace",
44+
"app_namespace",
10445
models.CharField(
46+
blank=True,
10547
editable=False,
10648
max_length=100,
10749
verbose_name="app instance namespace",
@@ -117,18 +59,6 @@ class Migration(migrations.Migration):
11759
verbose_name="menu",
11860
),
11961
),
120-
(
121-
"template_key",
122-
models.CharField(
123-
choices=[
124-
("standard", "standard"),
125-
("with-sidebar", "with sidebar"),
126-
],
127-
default="standard",
128-
max_length=100,
129-
verbose_name="template",
130-
),
131-
),
13262
(
13363
"language_code",
13464
models.CharField(
@@ -147,7 +77,14 @@ class Migration(migrations.Migration):
14777
(
14878
"position",
14979
models.PositiveIntegerField(
150-
db_index=True, default=0, editable=False
80+
db_index=True,
81+
editable=False,
82+
validators=[
83+
django.core.validators.MinValueValidator(
84+
limit_value=1,
85+
message="Position is expected to be greater than zero.",
86+
)
87+
],
15188
),
15289
),
15390
(
@@ -177,13 +114,15 @@ class Migration(migrations.Migration):
177114
null=True,
178115
on_delete=django.db.models.deletion.CASCADE,
179116
related_name="children",
180-
to="pages.Page",
117+
to="pages.page",
118+
verbose_name="parent",
181119
),
182120
),
183121
],
184122
options={
185123
"verbose_name": "page",
186124
"verbose_name_plural": "pages",
125+
"ordering": ("position",),
187126
"abstract": False,
188127
},
189128
),
@@ -207,7 +146,7 @@ class Migration(migrations.Migration):
207146
models.ForeignKey(
208147
on_delete=django.db.models.deletion.CASCADE,
209148
related_name="pages_richtext_set",
210-
to="pages.Page",
149+
to="pages.page",
211150
),
212151
),
213152
],
@@ -217,13 +156,83 @@ class Migration(migrations.Migration):
217156
"abstract": False,
218157
},
219158
),
220-
migrations.AddField(
221-
model_name="image",
222-
name="parent",
223-
field=models.ForeignKey(
224-
on_delete=django.db.models.deletion.CASCADE,
225-
related_name="pages_image_set",
226-
to="pages.Page",
227-
),
159+
migrations.CreateModel(
160+
name="Image",
161+
fields=[
162+
(
163+
"id",
164+
models.AutoField(
165+
auto_created=True,
166+
primary_key=True,
167+
serialize=False,
168+
verbose_name="ID",
169+
),
170+
),
171+
(
172+
"image",
173+
imagefield.fields.ImageField(
174+
height_field="height",
175+
upload_to="images/%Y/%m",
176+
verbose_name="image",
177+
width_field="width",
178+
),
179+
),
180+
(
181+
"width",
182+
models.PositiveIntegerField(
183+
blank=True,
184+
editable=False,
185+
null=True,
186+
verbose_name="image width",
187+
),
188+
),
189+
(
190+
"height",
191+
models.PositiveIntegerField(
192+
blank=True,
193+
editable=False,
194+
null=True,
195+
verbose_name="image height",
196+
),
197+
),
198+
(
199+
"ppoi",
200+
imagefield.fields.PPOIField(
201+
default="0.5x0.5",
202+
max_length=20,
203+
verbose_name="primary point of interest",
204+
),
205+
),
206+
(
207+
"alternative_text",
208+
models.CharField(
209+
blank=True,
210+
help_text="Describe the contents, e.g. for screenreaders.",
211+
max_length=200,
212+
verbose_name="alternative text",
213+
),
214+
),
215+
("region", models.CharField(max_length=255)),
216+
("ordering", models.IntegerField(default=0)),
217+
(
218+
"caption",
219+
models.CharField(
220+
blank=True, max_length=200, verbose_name="caption"
221+
),
222+
),
223+
(
224+
"parent",
225+
models.ForeignKey(
226+
on_delete=django.db.models.deletion.CASCADE,
227+
related_name="pages_image_set",
228+
to="pages.page",
229+
),
230+
),
231+
],
232+
options={
233+
"verbose_name": "image",
234+
"verbose_name_plural": "images",
235+
"abstract": False,
236+
},
228237
),
229238
]

0 commit comments

Comments
 (0)