Merge branch 'develop'

TandoorRecipes · Jun 24, 2023 · f779107 · f779107
2 parents 9decf3c + 4a5c8f4
commit f779107
Show file tree

Hide file tree

Showing 8 changed files with 173 additions and 85 deletions.
diff --git a/cookbook/locale/el/LC_MESSAGES/django.po b/cookbook/locale/el/LC_MESSAGES/django.po
diff --git a/cookbook/serializer.py b/cookbook/serializer.py
@@ -78,6 +78,19 @@ def get_image(self, obj):
             return path
 
 
+class OpenDataModelMixin(serializers.ModelSerializer):
+
+    def create(self, validated_data):
+        if 'open_data_slug' in validated_data and validated_data['open_data_slug'] is not None and validated_data['open_data_slug'].strip() == '':
+            validated_data['open_data_slug'] = None
+        return super().create(validated_data)
+
+    def update(self, instance, validated_data):
+        if 'open_data_slug' in validated_data and validated_data['open_data_slug'] is not None and validated_data['open_data_slug'].strip() == '':
+            validated_data['open_data_slug'] = None
+        return super().update(instance, validated_data)
+
+
 class CustomDecimalField(serializers.Field):
     """
     Custom decimal field to normalize useless decimal places
@@ -440,7 +453,7 @@ class Meta:
         read_only_fields = ('id', 'label', 'numchild', 'parent', 'image')
 
 
-class UnitSerializer(UniqueFieldsMixin, ExtendedRecipeMixin):
+class UnitSerializer(UniqueFieldsMixin, ExtendedRecipeMixin, OpenDataModelMixin):
     recipe_filter = 'steps__ingredients__unit'
 
     def create(self, validated_data):
@@ -469,7 +482,7 @@ class Meta:
         read_only_fields = ('id', 'numrecipe', 'image')
 
 
-class SupermarketCategorySerializer(UniqueFieldsMixin, WritableNestedModelSerializer):
+class SupermarketCategorySerializer(UniqueFieldsMixin, WritableNestedModelSerializer, OpenDataModelMixin):
 
     def create(self, validated_data):
         name = validated_data.pop('name').strip()
@@ -493,15 +506,15 @@ class Meta:
         fields = ('id', 'category', 'supermarket', 'order')
 
 
-class SupermarketSerializer(UniqueFieldsMixin, SpacedModelSerializer):
+class SupermarketSerializer(UniqueFieldsMixin, SpacedModelSerializer, OpenDataModelMixin):
     category_to_supermarket = SupermarketCategoryRelationSerializer(many=True, read_only=True)
 
     class Meta:
         model = Supermarket
         fields = ('id', 'name', 'description', 'category_to_supermarket', 'open_data_slug')
 
 
-class PropertyTypeSerializer(serializers.ModelSerializer):
+class PropertyTypeSerializer(OpenDataModelMixin):
     def create(self, validated_data):
         validated_data['space'] = self.context['request'].space
 
@@ -556,7 +569,7 @@ class Meta:
         fields = ('id', 'name', 'plural_name')
 
 
-class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedRecipeMixin):
+class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedRecipeMixin, OpenDataModelMixin):
     supermarket_category = SupermarketCategorySerializer(allow_null=True, required=False)
     recipe = RecipeSimpleSerializer(allow_null=True, required=False)
     # shopping = serializers.SerializerMethodField('get_shopping_status')
@@ -764,7 +777,7 @@ class Meta:
         )
 
 
-class UnitConversionSerializer(WritableNestedModelSerializer):
+class UnitConversionSerializer(WritableNestedModelSerializer, OpenDataModelMixin):
     name = serializers.SerializerMethodField('get_conversion_name')
     base_unit = UnitSerializer()
     converted_unit = UnitSerializer()

diff --git a/cookbook/views/api.py b/cookbook/views/api.py
@@ -252,7 +252,7 @@ def merge(self, request, pk, target):
 
             try:
                 if isinstance(source, Food):
-                    source.properties.through.objects.all().delete()
+                    source.properties.remove()
 
                 for link in [field for field in source._meta.get_fields() if issubclass(type(field), ForeignObjectRel)]:
                     linkManager = getattr(source, link.get_accessor_name())

diff --git a/vue/src/apps/RecipeView/RecipeView.vue b/vue/src/apps/RecipeView/RecipeView.vue
@@ -1,6 +1,6 @@
 <template>
-    <div id="app">
-        <recipe-view-component></recipe-view-component>
+    <div id="app" v-if="recipe_id !== undefined">
+        <recipe-view-component :recipe_id="recipe_id"></recipe-view-component>
 
         <bottom-navigation-bar></bottom-navigation-bar>
     </div>
@@ -12,20 +12,23 @@ import {BootstrapVue} from "bootstrap-vue"
 import "bootstrap-vue/dist/bootstrap-vue.css"
 
 import RecipeViewComponent from "@/components/RecipeViewComponent.vue";
+import BottomNavigationBar from "@/components/BottomNavigationBar.vue";
 
 Vue.use(BootstrapVue)
 
 export default {
     name: "RecipeView",
     mixins: [],
     components: {
-        RecipeViewComponent
+        RecipeViewComponent,
+        BottomNavigationBar
     },
     computed: {},
     data() {
-        return {}
+        return {
+            recipe_id: window.RECIPE_ID
+        }
     },
-
     mounted() {
         this.$i18n.locale = window.CUSTOM_LOCALE
     },

diff --git a/vue/src/components/KeywordsComponent.vue b/vue/src/components/KeywordsComponent.vue
@@ -1,8 +1,14 @@
 <template>
     <div v-if="recipe.keywords.length > 0">
       <span :key="k.id" v-for="k in recipe.keywords.slice(0,keyword_splice).filter((kk) => { return kk.show || kk.show === undefined })" class="pl-1">
-          <a :href="`${resolveDjangoUrl('view_search')}?keyword=${k.id}`"><b-badge pill variant="light"
-                                                                                   class="font-weight-normal">{{ k.label }}</b-badge></a>
+          <template v-if="enable_keyword_links">
+              <a :href="`${resolveDjangoUrl('view_search')}?keyword=${k.id}`">
+                  <b-badge pill variant="light" class="font-weight-normal">{{ k.label }}</b-badge>
+              </a>
+          </template>
+          <template v-else>
+             <b-badge pill variant="light" class="font-weight-normal">{{ k.label }}</b-badge>
+          </template>
 
       </span>
     </div>
@@ -18,10 +24,11 @@ export default {
     props: {
         recipe: Object,
         limit: Number,
+        enable_keyword_links: {type: Boolean, default: true}
     },
     computed: {
-        keyword_splice: function (){
-            if(this.limit){
+        keyword_splice: function () {
+            if (this.limit) {
                 return this.limit
             }
             return this.recipe.keywords.lenght

diff --git a/vue/src/components/RecipeCard.vue b/vue/src/components/RecipeCard.vue
@@ -21,7 +21,7 @@
         <template v-else>
             <b-card no-body v-hover v-if="recipe" style="height: 100%">
 
-                <a :href="this.recipe.id !== undefined ? resolveDjangoUrl('view_recipe', this.recipe.id) : null">
+                <a :href="recipe_link">
                     <div class="content">
                         <div class="content-overlay" v-if="recipe.description !== null && recipe.description !== ''"></div>
                         <b-card-img-lazy style="height: 15vh; object-fit: cover" class="" :src="recipe_image"
@@ -50,7 +50,7 @@
                 <b-card-body class="p-2 pl-3 pr-3">
                     <div class="d-flex flex-row">
                         <div class="flex-grow-1">
-                            <a :href="this.recipe.id !== undefined ? resolveDjangoUrl('view_recipe', this.recipe.id) : null" class="text-body font-weight-bold two-row-text">
+                            <a :href="recipe_link" class="text-body font-weight-bold two-row-text">
                             <template v-if="recipe !== null">{{ recipe.name }}</template>
                             <template v-else>{{ meal_plan.title }}</template>
                         </a>
@@ -71,7 +71,7 @@
 
                             <p class="mt-1 mb-1">
                                 <last-cooked :recipe="recipe"></last-cooked>
-                                <keywords-component :recipe="recipe" :limit="3"
+                                <keywords-component :recipe="recipe" :limit="3" :enable_keyword_links="enable_keyword_links"
                                                     style="margin-top: 4px; position: relative; z-index: 3;"></keywords-component>
                             </p>
                             <transition name="fade" mode="in-out">
@@ -152,6 +152,8 @@ export default {
         detailed: {type: Boolean, default: true},
         show_context_menu: {type: Boolean, default: true},
         context_disabled_options: Object,
+        open_recipe_on_click: {type: Boolean, default: true},
+        enable_keyword_links: {type: Boolean, default: true},
     },
     data() {
         return {
@@ -178,6 +180,13 @@ export default {
         waiting_time: function () {
             return calculateHourMinuteSplit(this.recipe.waiting_time)
         },
+        recipe_link: function (){
+            if(this.open_recipe_on_click){
+                return this.recipe.id !== undefined ? resolveDjangoUrl('view_recipe', this.recipe.id) : null
+            } else {
+                return "#"
+            }
+        }
     },
     methods: {},
     directives: {

diff --git a/vue/src/components/RecipeViewComponent.vue b/vue/src/components/RecipeViewComponent.vue
@@ -6,7 +6,7 @@
         </template>
 
         <div v-if="!loading" style="padding-bottom: 60px">
-            <RecipeSwitcher ref="ref_recipe_switcher" @switch="quickSwitch($event)"/>
+            <RecipeSwitcher ref="ref_recipe_switcher" @switch="quickSwitch($event)" v-if="show_recipe_switcher"/>
             <div class="row">
                 <div class="col-12" style="text-align: center">
                     <h3>{{ recipe.name }}</h3>
@@ -27,7 +27,7 @@
             </div>
 
             <div style="text-align: center">
-                <keywords-component :recipe="recipe"></keywords-component>
+                <keywords-component :recipe="recipe" :enable_keyword_links="enable_keyword_links"></keywords-component>
             </div>
 
             <hr/>
@@ -77,7 +77,7 @@
 
                 <div class="col col-md-2 col-2 mt-2 mt-md-0 text-right">
                     <recipe-context-menu v-bind:recipe="recipe" :servings="servings"
-                                         :disabled_options="{print:false}"></recipe-context-menu>
+                                         :disabled_options="{print:false}" v-if="show_context_menu"></recipe-context-menu>
                 </div>
             </div>
             <hr/>
@@ -234,13 +234,20 @@ export default {
             ingredient_height: '250',
         }
     },
+    props: {
+        recipe_id: Number,
+        show_context_menu: {type: Boolean, default: true},
+        enable_keyword_links: {type: Boolean, default: true},
+        show_recipe_switcher: {type: Boolean, default: true},
+        //show_comments: {type: Boolean, default: true},
+    },
     watch: {
         servings(newVal, oldVal) {
             this.servings_cache[this.recipe.id] = this.servings
         },
     },
     mounted() {
-        this.loadRecipe(window.RECIPE_ID)
+        this.loadRecipe(this.recipe_id)
         this.$i18n.locale = window.CUSTOM_LOCALE
         this.requestWakeLock()
         window.addEventListener('resize', this.handleResize);

diff --git a/vue/src/locales/de.json b/vue/src/locales/de.json
@@ -296,7 +296,7 @@
     "OnHand_help": "Lebensmittel ist \"Vorrätig\" und wird nicht automatisch zur Einkaufsliste hinzugefügt. Der Status \"Vorrätig\" wird mit den Benutzern der Einkaufsliste geteilt.",
     "shopping_category_help": "Einkaufsläden können nach Produktkategorie entsprechend der Anordnung der Regalreihen sortiert werden.",
     "Foods": "Lebensmittel",
-    "food_recipe_help": "Wird ein Rezept hier verknüpft, wird diese Verknüpfung in allen anderen Rezepten übernommen, die dieses Lebensmittel beinhaltet",
+    "food_recipe_help": "Wird ein Rezept hier verknüpft, wird diese Verknüpfung in allen anderen Rezepten übernommen, die dieses Lebensmittel beinhalten",
     "review_shopping": "Überprüfe die Einkaufsliste vor dem Speichern",
     "view_recipe": "Rezept anschauen",
     "Planned": "Geplant",
@@ -362,7 +362,7 @@
     "and_down": "& Runter",
     "enable_expert": "Expertenmodus aktivieren",
     "filter_name": "Name des Filters",
-    "shared_with": "Geteilt mit",
+    "shared_with": "geteilt mit",
     "asc": "Aufsteigend",
     "desc": "Absteigend",
     "book_filter_help": "Schließt zusätzlich zu den manuell hinzugefügten Rezepten, alle Rezepte die dem Filter entsprechen ein.",
@@ -408,7 +408,7 @@
     "New_Supermarket": "Erstelle einen neuen Supermarkt",
     "New_Supermarket_Category": "Erstelle eine neue Supermarktkategorie",
     "warning_space_delete": "Du kannst deinen Space inklusive all deiner Rezepte, Shoppinglisten, Essensplänen und allem anderen, das du erstellt hast löschen. Dieser Schritt kann nicht rückgängig gemacht werden! Bist du sicher, dass du das tun möchtest?",
-    "Copy Link": "Kopiere den Link in die Zwischenablage",
+    "Copy Link": "Link Kopieren",
     "Users": "Benutzer",
     "facet_count_info": "Zeige die Anzahl der Rezepte auf den Suchfiltern.",
     "Copy Token": "Kopiere Token",
@@ -460,9 +460,9 @@
     "Comments_setting": "Kommentare anzeigen",
     "reset_food_inheritance": "Vererbung zurücksetzen",
     "food_inherit_info": "Datenfelder des Lebensmittels, die standardmäßig vererbt werden sollen.",
-    "Are_You_Sure": "Bist du dir sicher?",
+    "Are_You_Sure": "Sind sie sicher?",
     "Plural": "Plural",
-    "plural_short": "pl.",
+    "plural_short": "Plural",
     "Use_Plural_Unit_Always": "Pluralform der Maßeinheit immer verwenden",
     "Use_Plural_Unit_Simple": "Pluralform der Maßeinheit dynamisch anpassen",
     "Use_Plural_Food_Always": "Pluralform des Essens immer verwenden",
@@ -498,5 +498,6 @@
     "Number of Objects": "Anzahl von Objekten",
     "Property": "Eigenschaft",
     "Conversion": "Umrechnung",
-    "Properties": "Eigenschaften"
+    "Properties": "Eigenschaften",
+    "total": "gesamt"
 }