Skip to content

Commit 98ee943

Browse files
Joel-LucaJoel-Luca
committed
Rename text to label
1 parent a7b5b40 commit 98ee943

File tree

12 files changed

+104
-52
lines changed

12 files changed

+104
-52
lines changed

‎app/tests/custom_fields/test_custom_field_base_manager.py‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,12 @@ def test_custom_field_base_manager_annotate_choice_value(self) -> None:
132132
field_type=CustomField.FIELD_TYPES.DATE,
133133
choice_field=True,
134134
)
135-
choice_1 = CustomValueFactory(field=field, text_de="Choice 1", value="choice_1")
135+
choice_1 = CustomValueFactory(
136+
field=field, label_de="Choice 1", value="choice_1"
137+
)
136138
self.person.custom_values.add(choice_1)
137139
self.assertEqual(
138-
{"id": choice_1.id, "text": "Choice 1", "value": "choice_1"},
140+
{"id": choice_1.id, "label": "Choice 1", "value": "choice_1"},
139141
Person.objects.first().choice_value,
140142
)
141143

@@ -150,20 +152,20 @@ def test_custom_field_base_manager_annotate_multiple_date_choice_value(
150152
multiple=True,
151153
)
152154
choice_1 = CustomValueFactory(
153-
field=field, text_de="Choice 1", value="2000-01-01"
155+
field=field, label_de="Choice 1", value="2000-01-01"
154156
)
155157
choice_2 = CustomValueFactory(
156-
field=field, text_de="Choice 2", value="2001-01-01"
158+
field=field, label_de="Choice 2", value="2001-01-01"
157159
)
158160
choice_3 = CustomValueFactory(
159-
field=field, text_de="Choice 3", value="2002-01-01"
161+
field=field, label_de="Choice 3", value="2002-01-01"
160162
)
161163
self.person.custom_values.set([choice_1, choice_2, choice_3])
162164
self.assertEqual(
163165
[
164-
{"id": choice_1.id, "text": "Choice 1", "value": "2000-01-01"},
165-
{"id": choice_2.id, "text": "Choice 2", "value": "2001-01-01"},
166-
{"id": choice_3.id, "text": "Choice 3", "value": "2002-01-01"},
166+
{"id": choice_1.id, "label": "Choice 1", "value": "2000-01-01"},
167+
{"id": choice_2.id, "label": "Choice 2", "value": "2001-01-01"},
168+
{"id": choice_3.id, "label": "Choice 3", "value": "2002-01-01"},
167169
],
168170
Person.objects.first().multiple_choice_value,
169171
)

‎app/tests/custom_fields/test_custom_field_base_model.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ def test_custom_field_base_model_set_choice_value(self) -> None:
244244
field_type=CustomField.FIELD_TYPES.CHAR,
245245
choice_field=True,
246246
)
247-
choice_1 = CustomValueFactory(field=field, text="Choice 1", value="choice_1")
247+
choice_1 = CustomValueFactory(field=field, label="Choice 1", value="choice_1")
248248

249249
# we need to annotate the custom_field_keys manually or to fetch the person with the queryset again,
250250
# because we created a new field
@@ -263,7 +263,7 @@ def test_custom_field_base_model_set_choice_value(self) -> None:
263263

264264
self.assertEqual(choice_1, self.person.choice_value)
265265
self.assertEqual(
266-
{"id": choice_1.id, "text": "Choice 1", "value": "choice_1"},
266+
{"id": choice_1.id, "label": "Choice 1", "value": "choice_1"},
267267
Person.objects.first().choice_value,
268268
)
269269

@@ -301,9 +301,9 @@ def test_custom_field_base_model_set_multiple_choice_value(
301301
)
302302
self.assertEqual(
303303
[
304-
{"id": choice_1.id, "text": None, "value": "2000-01-01"},
305-
{"id": choice_2.id, "text": None, "value": "2001-01-01"},
306-
{"id": choice_3.id, "text": None, "value": "2002-01-01"},
304+
{"id": choice_1.id, "label": None, "value": "2000-01-01"},
305+
{"id": choice_2.id, "label": None, "value": "2001-01-01"},
306+
{"id": choice_3.id, "label": None, "value": "2002-01-01"},
307307
],
308308
Person.objects.first().multiple_choice_value,
309309
)

‎app/tests/custom_fields/test_custom_field_model_base_serializer.py‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -118,18 +118,18 @@ def test_custom_field_base_model_serializer_data(self) -> None:
118118
"multiple_date_value": ["2000-01-01", "2001-01-01"],
119119
"choice_value": {
120120
"id": self.choice_1.id,
121-
"text": None,
121+
"label": None,
122122
"value": "2000-01-01",
123123
},
124124
"multiple_choice_value": [
125125
{
126126
"id": self.multiple_choice_1.id,
127-
"text": None,
127+
"label": None,
128128
"value": "2000-01-01",
129129
},
130130
{
131131
"id": self.multiple_choice_2.id,
132-
"text": None,
132+
"label": None,
133133
"value": "2001-01-01",
134134
},
135135
],
@@ -174,13 +174,13 @@ def test_custom_field_base_model_serializer_create(self) -> None:
174174
)
175175
self.assertEqual(
176176
instance.choice_value,
177-
{"id": self.choice_1.id, "text": None, "value": "2000-01-01"},
177+
{"id": self.choice_1.id, "label": None, "value": "2000-01-01"},
178178
)
179179
self.assertEqual(
180180
instance.multiple_choice_value,
181181
[
182-
{"id": self.multiple_choice_1.id, "text": None, "value": "2000-01-01"},
183-
{"id": self.multiple_choice_2.id, "text": None, "value": "2001-01-01"},
182+
{"id": self.multiple_choice_1.id, "label": None, "value": "2000-01-01"},
183+
{"id": self.multiple_choice_2.id, "label": None, "value": "2001-01-01"},
184184
],
185185
)
186186

@@ -214,18 +214,18 @@ def test_custom_field_base_model_serializer_update(self) -> None:
214214
"multiple_date_value": ["2000-01-01", "2001-01-01"],
215215
"choice_value": {
216216
"id": self.choice_1.id,
217-
"text": None,
217+
"label": None,
218218
"value": "2000-01-01",
219219
},
220220
"multiple_choice_value": [
221221
{
222222
"id": self.multiple_choice_1.id,
223-
"text": None,
223+
"label": None,
224224
"value": "2000-01-01",
225225
},
226226
{
227227
"id": self.multiple_choice_2.id,
228-
"text": None,
228+
"label": None,
229229
"value": "2001-01-01",
230230
},
231231
],
@@ -246,18 +246,18 @@ def test_custom_field_base_model_serializer_update(self) -> None:
246246
"multiple_date_value": ["2002-01-01", "2003-01-01"],
247247
"choice_value": {
248248
"id": self.choice_2.id,
249-
"text": None,
249+
"label": None,
250250
"value": "2000-01-01",
251251
},
252252
"multiple_choice_value": [
253253
{
254254
"id": self.multiple_choice_1.id,
255-
"text": None,
255+
"label": None,
256256
"value": "2000-01-01",
257257
},
258258
{
259259
"id": self.multiple_choice_3.id,
260-
"text": None,
260+
"label": None,
261261
"value": "2002-01-01",
262262
},
263263
],
@@ -284,13 +284,13 @@ def test_custom_field_base_model_serializer_update(self) -> None:
284284
)
285285
self.assertEqual(
286286
instance.choice_value,
287-
{"id": self.choice_2.id, "text": None, "value": "2001-01-01"},
287+
{"id": self.choice_2.id, "label": None, "value": "2001-01-01"},
288288
)
289289
self.assertEqual(
290290
instance.multiple_choice_value,
291291
[
292-
{"id": self.multiple_choice_1.id, "text": None, "value": "2000-01-01"},
293-
{"id": self.multiple_choice_3.id, "text": None, "value": "2002-01-01"},
292+
{"id": self.multiple_choice_1.id, "label": None, "value": "2000-01-01"},
293+
{"id": self.multiple_choice_3.id, "label": None, "value": "2002-01-01"},
294294
],
295295
)
296296

@@ -324,18 +324,18 @@ def test_custom_field_base_model_serializer_partial_update(self) -> None:
324324
"multiple_date_value": ["2000-01-01", "2001-01-01"],
325325
"choice_value": {
326326
"id": self.choice_1.id,
327-
"text": None,
327+
"label": None,
328328
"value": "2000-01-01",
329329
},
330330
"multiple_choice_value": [
331331
{
332332
"id": self.multiple_choice_1.id,
333-
"text": None,
333+
"label": None,
334334
"value": "2000-01-01",
335335
},
336336
{
337337
"id": self.multiple_choice_2.id,
338-
"text": None,
338+
"label": None,
339339
"value": "2001-01-01",
340340
},
341341
],
@@ -369,7 +369,7 @@ def test_custom_field_base_model_serializer_partial_update(self) -> None:
369369
)
370370
self.assertEqual(
371371
instance.choice_value,
372-
{"id": self.choice_1.id, "text": None, "value": "2000-01-01"},
372+
{"id": self.choice_1.id, "label": None, "value": "2000-01-01"},
373373
)
374374
self.assertEqual(instance.multiple_choice_value, [])
375375

‎app/tests/custom_fields/test_custom_field_serializer.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@ def test_custom_choice_field_serializer(self) -> None:
4444
)
4545
self.choice_1 = CustomValueFactory(
4646
field=self.choice_field,
47-
text="Choice 1",
47+
label="Choice 1",
4848
value="choice_1",
4949
)
5050
self.choice_2 = CustomValueFactory(
5151
field=self.choice_field,
52-
text="Choice 2",
52+
label="Choice 2",
5353
value="choice_2",
5454
)
5555
self.choice_3 = CustomValueFactory(
5656
field=self.choice_field,
57-
text="Choice 3",
57+
label="Choice 3",
5858
value="choice_3",
5959
)
6060

@@ -65,17 +65,17 @@ def test_custom_choice_field_serializer(self) -> None:
6565
"choices": [
6666
{
6767
"id": self.choice_1.id,
68-
"text": "Choice 1",
68+
"label": "Choice 1",
6969
"value": "choice_1",
7070
},
7171
{
7272
"id": self.choice_2.id,
73-
"text": "Choice 2",
73+
"label": "Choice 2",
7474
"value": "choice_2",
7575
},
7676
{
7777
"id": self.choice_3.id,
78-
"text": "Choice 3",
78+
"label": "Choice 3",
7979
"value": "choice_3",
8080
},
8181
],

‎app/tests/test_mapping_serializer.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,13 @@ def test_mapping_serializer_create(self) -> None:
152152
)
153153
self.assertEqual(
154154
instance.choice_value,
155-
{"id": self.choice_1.id, "text": None, "value": "2000-01-01"},
155+
{"id": self.choice_1.id, "label": None, "value": "2000-01-01"},
156156
)
157157
self.assertEqual(
158158
instance.multiple_choice_value,
159159
[
160-
{"id": self.multiple_choice_1.id, "text": None, "value": "2000-01-01"},
161-
{"id": self.multiple_choice_2.id, "text": None, "value": "2001-01-01"},
160+
{"id": self.multiple_choice_1.id, "label": None, "value": "2000-01-01"},
161+
{"id": self.multiple_choice_2.id, "label": None, "value": "2001-01-01"},
162162
],
163163
)
164164

@@ -215,13 +215,13 @@ def test_mapping_serializer_update(self) -> None:
215215
)
216216
self.assertEqual(
217217
instance.choice_value,
218-
{"id": self.choice_2.id, "text": None, "value": "2001-01-01"},
218+
{"id": self.choice_2.id, "label": None, "value": "2001-01-01"},
219219
)
220220
self.assertEqual(
221221
instance.multiple_choice_value,
222222
[
223-
{"id": self.multiple_choice_1.id, "text": None, "value": "2000-01-01"},
224-
{"id": self.multiple_choice_3.id, "text": None, "value": "2002-01-01"},
223+
{"id": self.multiple_choice_1.id, "label": None, "value": "2000-01-01"},
224+
{"id": self.multiple_choice_3.id, "label": None, "value": "2002-01-01"},
225225
],
226226
)
227227

‎django_features/custom_fields/admin.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ class CustomFieldAdmin(CustomFieldBaseAdmin):
5656
@admin.register(models.CustomValue)
5757
class ValueAdmin(TranslationAdmin):
5858
list_display = ["id", "__str__"]
59-
search_fields = ("text", "value", "field__label", "field__identifier")
59+
search_fields = ("label", "value", "field__label", "field__identifier")

‎django_features/custom_fields/migrations/0005_rename_text_to_label.py‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Generated by Django 4.2.23 on 2025-10-22 12:04
2+
3+
from django.db import migrations
4+
from django.db import models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
("custom_fields", "0004_remove_mutiple_choice_field"),
11+
]
12+
13+
operations = [
14+
migrations.RemoveField(
15+
model_name="customvalue",
16+
name="text",
17+
),
18+
migrations.RemoveField(
19+
model_name="customvalue",
20+
name="text_de",
21+
),
22+
migrations.RemoveField(
23+
model_name="customvalue",
24+
name="text_en",
25+
),
26+
migrations.RemoveField(
27+
model_name="customvalue",
28+
name="text_fr",
29+
),
30+
migrations.AddField(
31+
model_name="customvalue",
32+
name="label",
33+
field=models.CharField(blank=True, null=True, verbose_name="Label"),
34+
),
35+
migrations.AddField(
36+
model_name="customvalue",
37+
name="label_de",
38+
field=models.CharField(blank=True, null=True, verbose_name="Label"),
39+
),
40+
migrations.AddField(
41+
model_name="customvalue",
42+
name="label_en",
43+
field=models.CharField(blank=True, null=True, verbose_name="Label"),
44+
),
45+
migrations.AddField(
46+
model_name="customvalue",
47+
name="label_fr",
48+
field=models.CharField(blank=True, null=True, verbose_name="Label"),
49+
),
50+
]

‎django_features/custom_fields/migrations/max_migration.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0004_remove_mutiple_choice_field
1+
0005_rename_text_to_label

‎django_features/custom_fields/models/base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def _subquery(self, field: CustomField) -> Subquery:
6868
sq = ArraySubquery if field.multiple else Subquery
6969
return sq(
7070
custom_values_queryset.annotate(
71-
formated=JSONObject(id="id", text="text", value="value")
71+
formated=JSONObject(id="id", label="label", value="value")
7272
).values_list("formated", flat=True)
7373
)
7474

‎django_features/custom_fields/models/value.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class CustomValue(TimeStampedModel):
3333
on_delete=models.CASCADE,
3434
)
3535
order = models.PositiveIntegerField(_("Reihenfolge"), default=0)
36-
text = models.CharField(verbose_name=_("Text"), null=True, blank=True)
36+
label = models.CharField(verbose_name=_("Label"), null=True, blank=True)
3737
value = models.JSONField(verbose_name=_("Wert"), null=True, blank=True)
3838

3939
objects = CustomValueQuerySet.as_manager()
@@ -47,5 +47,5 @@ def __str__(self) -> str:
4747
return self.label
4848

4949
@property
50-
def label(self) -> str:
51-
return self.text or str(self.value)
50+
def text(self) -> str:
51+
return self.label or str(self.value)

0 commit comments

Comments
 (0)