Skip to content
This repository was archived by the owner on Jul 27, 2024. It is now read-only.

Commit 2602369

Browse files
committed
Use 'id' instead of 'pk' in serializers
For consistency with model definitions
1 parent 67b044b commit 2602369

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

Closure_Front_End/src/components/Navigation.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export default {
5858
return await fetchDjangoListIntoSelectOptions(this.http, url, track => track.name);
5959
},
6060
async fetchCourses(query) {
61-
const url = `tracks/${this.selectedTrack?.pk ?? 'null'}/courses/?limit=6&offset=15&data_year=${this.selectedYear}&search=${query}`;
61+
const url = `tracks/${this.selectedTrack?.id ?? 'null'}/courses/?limit=6&offset=15&data_year=${this.selectedYear}&search=${query}`;
6262
return await fetchDjangoListIntoSelectOptions(this.http, url, course => course.name);
6363
},
6464
}

Closure_Project/rest_api/serializers/CourseGroupSerializer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
class CourseGroupSerializer(DynamicFieldsModelSerializer):
7-
courses = CourseSerializer(fields=('pk', 'course_id', 'name', 'semester', 'points'), many=True, read_only=True)
7+
courses = CourseSerializer(fields=('id', 'course_id', 'name', 'semester', 'points'), many=True, read_only=True)
88

99
class Meta:
1010
model = CourseGroup

Closure_Project/rest_api/serializers/CourseSerializer.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55

66

77
class CourseSerializer(DynamicFieldsModelSerializer):
8-
pk = serializers.PrimaryKeyRelatedField(source='id', read_only=True)
9-
108
class Meta:
119
model = Course
12-
fields = ('pk', 'course_id', 'data_year', 'name', 'semester', 'points', 'is_given_this_year',
10+
fields = ('id', 'course_id', 'data_year', 'name', 'semester', 'points', 'is_given_this_year',
1311
'is_corner_stone', 'comment')
12+
read_only_fields = ('id',)
1413

1514
class CourseOfTrackSerializer(CourseSerializer):
1615
type = serializers.SerializerMethodField(method_name='get_type')

Closure_Project/rest_api/serializers/TrackSerializer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55

66
class TrackSerializer(DynamicFieldsModelSerializer):
7-
pk = serializers.PrimaryKeyRelatedField(source='id', read_only=True)
87
total_points = serializers.IntegerField(read_only=True)
98

109
class Meta:
1110
model = Track
12-
fields = ('pk', 'track_number', 'name', 'data_year', 'total_points', 'points_must', 'points_from_list',
11+
fields = ('id', 'track_number', 'name', 'data_year', 'total_points', 'points_must', 'points_from_list',
1312
'points_choice', 'points_complementary', 'points_corner_stones',
1413
'points_minor', 'points_additional_hug', 'comment')
14+
read_only_fields = ('id',)
1515

1616
class TrackSerializerWithCourseGroups(TrackSerializer):
1717
course_groups = CourseGroupSerializer(source='coursegroup_set', many=True, read_only=True)

0 commit comments

Comments
 (0)