fixed space settings saving issue

This commit is contained in:
vabene1111
2022-08-04 18:54:00 +02:00
parent f7af0741fe
commit 8ed5d52ddf
3 changed files with 21 additions and 2 deletions

View File

@ -0,0 +1,19 @@
# Generated by Django 4.0.6 on 2022-08-04 16:46
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('cookbook', '0182_userpreference_image'),
]
operations = [
migrations.AlterField(
model_name='space',
name='image',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='space_image', to='cookbook.userfile'),
),
]

View File

@ -253,7 +253,7 @@ class FoodInheritField(models.Model, PermissionModelMixin):
class Space(ExportModelOperationsMixin('space'), models.Model): class Space(ExportModelOperationsMixin('space'), models.Model):
name = models.CharField(max_length=128, default='Default') name = models.CharField(max_length=128, default='Default')
image = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True, related_name='space_image') image = models.ForeignKey("UserFile", on_delete=models.SET_NULL, null=True, blank=True, related_name='space_image')
created_by = models.ForeignKey(User, on_delete=models.PROTECT, null=True) created_by = models.ForeignKey(User, on_delete=models.PROTECT, null=True)
created_at = models.DateTimeField(auto_now_add=True) created_at = models.DateTimeField(auto_now_add=True)
message = models.CharField(max_length=512, default='', blank=True) message = models.CharField(max_length=512, default='', blank=True)

View File

@ -257,7 +257,7 @@ class SpaceSerializer(WritableNestedModelSerializer):
recipe_count = serializers.SerializerMethodField('get_recipe_count') recipe_count = serializers.SerializerMethodField('get_recipe_count')
file_size_mb = serializers.SerializerMethodField('get_file_size_mb') file_size_mb = serializers.SerializerMethodField('get_file_size_mb')
food_inherit = FoodInheritFieldSerializer(many=True) food_inherit = FoodInheritFieldSerializer(many=True)
image = UserFileViewSerializer(required=False, many=False) image = UserFileViewSerializer(required=False, many=False, allow_null=True)
def get_user_count(self, obj): def get_user_count(self, obj):
return UserSpace.objects.filter(space=obj).count() return UserSpace.objects.filter(space=obj).count()