Skip to content

Commit

Permalink
Merge branch 'develop' into feature/vue3
Browse files Browse the repository at this point in the history
  • Loading branch information
vabene1111 committed Dec 22, 2024
2 parents 9b586ae + f61a837 commit de6627a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 20 deletions.
18 changes: 0 additions & 18 deletions cookbook/migrations/0220_recipe_images.py

This file was deleted.

2 changes: 0 additions & 2 deletions cookbook/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)

Expand Down

0 comments on commit de6627a

Please sign in to comment.