Merge branch 'develop' into feature/vue3

This commit is contained in:
vabene1111
2024-12-22 12:13:09 +01:00
2 changed files with 0 additions and 20 deletions

View File

@@ -1,18 +0,0 @@
# Generated by Django 4.2.17 on 2024-12-22 11:05
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('cookbook', '0219_connectorconfig_supports_description_field'),
]
operations = [
migrations.AddField(
model_name='recipe',
name='images',
field=models.ManyToManyField(blank=True, to='cookbook.userfile'),
),
]

View File

@@ -1007,7 +1007,6 @@ class Recipe(ExportModelOperationsMixin('recipe'), models.Model, PermissionModel
servings = models.IntegerField(default=1)
servings_text = models.CharField(default='', blank=True, max_length=32)
image = models.ImageField(upload_to='recipes/', blank=True, null=True)
images = models.ManyToManyField("UserFile", blank=True)
storage = models.ForeignKey(Storage, on_delete=models.PROTECT, blank=True, null=True)
file_uid = models.CharField(max_length=256, default="", blank=True)
file_path = models.CharField(max_length=512, default="", blank=True)
@@ -1436,7 +1435,6 @@ class UserFile(ExportModelOperationsMixin('user_files'), models.Model, Permissio
name = models.CharField(max_length=128)
file = models.FileField(upload_to='files/')
file_size_kb = models.IntegerField(default=0, blank=True)
is_image = models.BooleanField(default=False)
created_at = models.DateTimeField(auto_now_add=True)
created_by = models.ForeignKey(User, on_delete=models.CASCADE)