Merge branch 'develop' into release-2.2

eHealthAfrica · Oct 6, 2021 · 7344a3a · 7344a3a
2 parents 206a77f + 734a9b4
commit 7344a3a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/aether-kernel/aether/kernel/api/serializers.py b/aether-kernel/aether/kernel/api/serializers.py
@@ -125,6 +125,7 @@ class MappingSetSerializer(DynamicFieldsMixin, DynamicFieldsModelSerializer):
 
     project = MtPrimaryKeyRelatedField(
         queryset=models.Project.objects.all(),
+        style={'base_template': 'input.html'},
     )
 
     class Meta:
@@ -150,10 +151,12 @@ class MappingSerializer(DynamicFieldsMixin, DynamicFieldsModelSerializer):
     project = MtPrimaryKeyRelatedField(
         queryset=models.Project.objects.all(),
         required=False,
+        style={'base_template': 'input.html'},
     )
     mappingset = MtPrimaryKeyRelatedField(
         queryset=models.MappingSet.objects.all(),
         mt_field='project',
+        style={'base_template': 'input.html'},
     )
 
     class Meta:
@@ -177,6 +180,7 @@ class AttachmentSerializer(DynamicFieldsMixin, DynamicFieldsModelSerializer):
     submission = MtPrimaryKeyRelatedField(
         queryset=models.Submission.objects.all(),
         mt_field='project',
+        style={'base_template': 'input.html'},
     )
 
     class Meta:
@@ -237,6 +241,11 @@ class SchemaDecoratorSerializer(DynamicFieldsMixin, DynamicFieldsModelSerializer
 
     project = MtPrimaryKeyRelatedField(
         queryset=models.Project.objects.all(),
+        style={'base_template': 'input.html'},
+    )
+    schema = serializers.PrimaryKeyRelatedField(
+        queryset=models.Schema.objects.all(),
+        style={'base_template': 'input.html'}
     )
 
     class Meta:
@@ -323,21 +332,25 @@ class EntitySerializer(DynamicFieldsMixin, KernelBaseSerializer):
     project = MtPrimaryKeyRelatedField(
         queryset=models.Project.objects.all(),
         required=False,
+        style={'base_template': 'input.html'},
     )
     submission = MtPrimaryKeyRelatedField(
         queryset=models.Submission.objects.all(),
         mt_field='mappingset__project',
         required=False,
+        style={'base_template': 'input.html'},
     )
     mapping = MtPrimaryKeyRelatedField(
         queryset=models.Mapping.objects.all(),
         mt_field='mappingset__project',
         required=False,
+        style={'base_template': 'input.html'},
     )
     schemadecorator = MtPrimaryKeyRelatedField(
         queryset=models.SchemaDecorator.objects.all(),
         mt_field='project',
         required=False,
+        style={'base_template': 'input.html'},
     )
 
     def create(self, validated_data):
@@ -474,6 +487,7 @@ class SubmissionSerializer(DynamicFieldsMixin, KernelBaseSerializer):
     project = MtPrimaryKeyRelatedField(
         queryset=models.Project.objects.all(),
         required=False,
+        style={'base_template': 'input.html'},
     )
 
     is_extracted = serializers.BooleanField(default=False)
@@ -482,6 +496,7 @@ class SubmissionSerializer(DynamicFieldsMixin, KernelBaseSerializer):
         queryset=models.MappingSet.objects.all(),
         mt_field='project',
         required=False,
+        style={'base_template': 'input.html'},
     )
 
     def create(self, validated_data):

diff --git a/aether-odk-module/aether/odk/api/serializers.py b/aether-odk-module/aether/odk/api/serializers.py
@@ -50,6 +50,7 @@ class MediaFileSerializer(DynamicFieldsMixin, DynamicFieldsModelSerializer):
     xform = MtPrimaryKeyRelatedField(
         queryset=XForm.objects.all(),
         mt_field='project',
+        style={'base_template': 'input.html'},
     )
 
     class Meta:
@@ -92,6 +93,7 @@ class XFormSerializer(DynamicFieldsMixin, DynamicFieldsModelSerializer):
 
     project = MtPrimaryKeyRelatedField(
         queryset=Project.objects.all(),
+        style={'base_template': 'input.html'},
     )
 
     def validate(self, value):

diff --git a/aether-ui/aether/ui/api/serializers.py b/aether-ui/aether/ui/api/serializers.py
@@ -63,8 +63,9 @@ class PipelineSerializer(DynamicFieldsMixin, DynamicFieldsModelSerializer):
     is_read_only = serializers.BooleanField(read_only=True)
 
     project = MtPrimaryKeyRelatedField(
-        required=False,
         queryset=models.Project.objects.all(),
+        required=False,
+        style={'base_template': 'input.html'},
     )
 
     def create(self, validated_data):