Skip to content

Commit 213db7f

Browse files
committed
Rename redirect_type to type in the APIv3 response
1 parent ba2dfe2 commit 213db7f

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
lines changed

readthedocs/api/v3/serializers.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from readthedocs.builds.models import Build, Version
1212
from readthedocs.projects.constants import LANGUAGES, PROGRAMMING_LANGUAGES
1313
from readthedocs.projects.models import Project
14-
from readthedocs.redirects.models import Redirect
14+
from readthedocs.redirects.models import Redirect, TYPE_CHOICES as REDIRECT_TYPE_CHOICES
1515

1616

1717
class UserSerializer(FlexFieldsModelSerializer):
@@ -495,14 +495,16 @@ class RedirectSerializerBase(serializers.ModelSerializer):
495495
modified = serializers.DateTimeField(source='update_dt', read_only=True)
496496
_links = RedirectLinksSerializer(source='*', read_only=True)
497497

498+
type = serializers.ChoiceField(source='redirect_type', choices=REDIRECT_TYPE_CHOICES)
499+
498500
class Meta:
499501
model = Redirect
500502
fields = [
501503
'pk',
502504
'created',
503505
'modified',
504506
'project',
505-
'redirect_type',
507+
'type',
506508
'from_url',
507509
'to_url',
508510
'_links',

readthedocs/api/v3/tests/responses/projects-redirects-detail.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
"from_url": "/docs/",
99
"pk": 1,
1010
"project": "project",
11-
"redirect_type": "page",
11+
"type": "page",
1212
"to_url": "/documentation/"
1313
}

readthedocs/api/v3/tests/responses/projects-redirects-detail_PUT.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
"from_url": "/changed/",
99
"pk": 1,
1010
"project": "project",
11-
"redirect_type": "page",
11+
"type": "page",
1212
"to_url": "/toanother/"
1313
}

readthedocs/api/v3/tests/responses/projects-redirects-list.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"from_url": "/docs/",
1414
"pk": 1,
1515
"project": "project",
16-
"redirect_type": "page",
16+
"type": "page",
1717
"to_url": "/documentation/"
1818
}
1919
]

readthedocs/api/v3/tests/responses/projects-redirects-list_POST.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
"from_url": "/page/",
99
"pk": 2,
1010
"project": "project",
11-
"redirect_type": "page",
11+
"type": "page",
1212
"to_url": "/another/"
1313
}

readthedocs/api/v3/tests/test_projects.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ def test_projects_redirects_list_post(self):
468468
data = {
469469
'from_url': '/page/',
470470
'to_url': '/another/',
471-
'redirect_type': 'page',
471+
'type': 'page',
472472
}
473473

474474
self.client.credentials(HTTP_AUTHORIZATION=f'Token {self.token.key}')
@@ -494,7 +494,7 @@ def test_projects_redirects_detail_put(self):
494494
data = {
495495
'from_url': '/changed/',
496496
'to_url': '/toanother/',
497-
'redirect_type': 'page',
497+
'type': 'page',
498498
}
499499

500500
self.client.credentials(HTTP_AUTHORIZATION=f'Token {self.token.key}')

0 commit comments

Comments
 (0)