Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2026-01-03 07:31:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Bug/misc fixes (#618)

Browse Source 
* Fixes #617

* set recipe settings default by env variables

* add variables to docker-compse

* update changelog

* bump dependencies

* add fallback name to scraper

Co-authored-by: hay-kot <hay-kot@pm.me>
This commit is contained in:
Hayden
2021-07-05 16:05:32 -08:00
committed by GitHub
parent 3e2c9f41cf
commit 9b5cf36981
16 changed files with 361 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mealie/schema/recipe.py
View File

@@ -4,7 +4,7 @@ from pathlib import Path
from typing import Any, Optional
from fastapi_camelcase import CamelModel
from mealie.core.config import app_dirs
from mealie.core.config import app_dirs, settings
from mealie.db.models.recipe.recipe import RecipeModel
from mealie.schema.comments import CommentOut
from pydantic import BaseModel, Field, validator
@@ -19,12 +19,12 @@ class RecipeImageTypes(str, Enum):
class RecipeSettings(CamelModel):
public: bool = True
show_nutrition: bool = True
show_assets: bool = True
landscape_view: bool = True
disable_comments: bool = False
disable_amount: bool = False
public: bool = settings.RECIPE_PUBLIC
show_nutrition: bool = settings.RECIPE_SHOW_NUTRITION
show_assets: bool = settings.RECIPE_SHOW_ASSETS
landscape_view: bool = settings.RECIPE_LANDSCAPE_VIEW
disable_comments: bool = settings.RECIPE_DISABLE_COMMENTS
disable_amount: bool = settings.RECIPE_DISABLE_AMOUNT
class Config:
orm_mode = True
@@ -130,7 +130,7 @@ class Recipe(RecipeSummary):
perform_time: Optional[str] = None
# Mealie Specific
settings: Optional[RecipeSettings]
settings: Optional[RecipeSettings] = RecipeSettings()
assets: Optional[list[RecipeAsset]] = []
notes: Optional[list[RecipeNote]] = []
org_url: Optional[str] = Field(None, alias="orgURL")