diff --git a/.vscode/PythonImportHelper-v2-Completion.json b/.vscode/PythonImportHelper-v2-Completion.json index 5e11184..3c39f05 100644 --- a/.vscode/PythonImportHelper-v2-Completion.json +++ b/.vscode/PythonImportHelper-v2-Completion.json @@ -1125,7 +1125,7 @@ "kind": 6, "importPath": "back.object.models", "description": "back.object.models", - "peekOfCode": "class Element3D(models.Model):\n parent = models.ForeignKey(\"self\", on_delete=models.PROTECT, blank=True, null=True)\n model_file = models.FileField(upload_to=group_based_upload_to)\n name = models.CharField(max_length=255)\n description = models.TextField()\n def __str__(self):\n return self.name\nclass Scene3D(models.Model):\n filter_horizontal = ('elements',)\n name = models.CharField(", + "peekOfCode": "class Element3D(models.Model):\n parent = models.ForeignKey(\"self\", on_delete=models.PROTECT, blank=True, null=True)\n model_file = models.FileField(upload_to=group_based_upload_to)\n name = models.CharField(max_length=255)\n description = models.TextField()\n def __str__(self):\n return self.name\nclass Scene3D(models.Model):\n filter_horizontal = (\"elements\",)\n name = models.CharField(", "detail": "back.object.models", "documentation": {} }, @@ -1134,7 +1134,7 @@ "kind": 6, "importPath": "back.object.models", "description": "back.object.models", - "peekOfCode": "class Scene3D(models.Model):\n filter_horizontal = ('elements',)\n name = models.CharField(\n max_length=120,\n )\n elements = models.ManyToManyField(Element3D)\n min_distance = models.IntegerField(\n validators=[MinValueValidator(1), MaxValueValidator(600)], blank=True, null=True\n )\n max_distance = models.IntegerField(", + "peekOfCode": "class Scene3D(models.Model):\n filter_horizontal = (\"elements\",)\n name = models.CharField(\n max_length=120,\n )\n elements = models.ManyToManyField(Element3D)\n min_distance = models.IntegerField(\n validators=[MinValueValidator(1), MaxValueValidator(600)], blank=True, null=True\n )\n max_distance = models.IntegerField(", "detail": "back.object.models", "documentation": {} }, @@ -1170,7 +1170,7 @@ "kind": 6, "importPath": "back.object.serializers", "description": "back.object.serializers", - "peekOfCode": "class Element3DSerializer(serializers.ModelSerializer):\n model_file = serializers.ImageField(use_url=False)\n class Meta:\n model = Element3D\n fields = \"__all__\"\nclass Scene3DSerializer(serializers.ModelSerializer):\n elements = Element3DSerializer(many=True)\n class Meta:\n model = Scene3D\n fields = \"__all__\"", + "peekOfCode": "class Element3DSerializer(serializers.ModelSerializer):\n model_file = serializers.ImageField(use_url=False)\n class Meta:\n model = Element3D\n fields = \"__all__\"\nclass Scene3DSerializer(serializers.ModelSerializer):\n elements = Element3DSerializer(many=True)\n hdr_gainmap = serializers.FileField(use_url=False)\n hdr_json = serializers.FileField(use_url=False)\n hdr_webp = serializers.FileField(use_url=False)", "detail": "back.object.serializers", "documentation": {} }, @@ -1179,7 +1179,7 @@ "kind": 6, "importPath": "back.object.serializers", "description": "back.object.serializers", - "peekOfCode": "class Scene3DSerializer(serializers.ModelSerializer):\n elements = Element3DSerializer(many=True)\n class Meta:\n model = Scene3D\n fields = \"__all__\"\n depth = 2\nclass ClickableAreaSerializer(serializers.ModelSerializer):\n class Meta:\n model = ClickableArea\n fields = \"__all__\"", + "peekOfCode": "class Scene3DSerializer(serializers.ModelSerializer):\n elements = Element3DSerializer(many=True)\n hdr_gainmap = serializers.FileField(use_url=False)\n hdr_json = serializers.FileField(use_url=False)\n hdr_webp = serializers.FileField(use_url=False)\n class Meta:\n model = Scene3D\n fields = \"__all__\"\n depth = 2\nclass ClickableAreaSerializer(serializers.ModelSerializer):", "detail": "back.object.serializers", "documentation": {} }, diff --git a/back/object/models.py b/back/object/models.py index 836febb..b6ad4be 100644 --- a/back/object/models.py +++ b/back/object/models.py @@ -23,7 +23,7 @@ class Element3D(models.Model): class Scene3D(models.Model): - filter_horizontal = ('elements',) + filter_horizontal = ("elements",) name = models.CharField( max_length=120, ) @@ -33,13 +33,16 @@ class Scene3D(models.Model): validators=[MinValueValidator(1), MaxValueValidator(600)], blank=True, null=True ) max_distance = models.IntegerField( - validators=[MinValueValidator(2), MaxValueValidator(1000)], blank=True, null=True + validators=[MinValueValidator(2), MaxValueValidator(1000)], + blank=True, + null=True, ) - hdr_gainmap = models.FileField(blank=True, null=True) - hdr_json = models.FileField(blank=True, null=True) - hdr_webp = models.FileField(blank=True, null=True) - + hdr_gainmap = models.FileField( + upload_to=group_based_upload_to, blank=True, null=True + ) + hdr_json = models.FileField(upload_to=group_based_upload_to, blank=True, null=True) + hdr_webp = models.FileField(upload_to=group_based_upload_to, blank=True, null=True) def __str__(self): return self.name diff --git a/back/object/serializers.py b/back/object/serializers.py index 5aa0011..c2cee28 100644 --- a/back/object/serializers.py +++ b/back/object/serializers.py @@ -12,7 +12,10 @@ class Element3DSerializer(serializers.ModelSerializer): class Scene3DSerializer(serializers.ModelSerializer): elements = Element3DSerializer(many=True) - + hdr_gainmap = serializers.FileField(use_url=False) + hdr_json = serializers.FileField(use_url=False) + hdr_webp = serializers.FileField(use_url=False) + class Meta: model = Scene3D fields = "__all__"