Merge branch 'develop'

Author: vabene1111

.github/workflows/build-docker-open-data.yml

@@ -55,7 +55,7 @@ jobs:
       # Build Vue frontend
       - uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: '18'
           cache: yarn
           cache-dependency-path: vue/yarn.lock
       - name: Install dependencies

.github/workflows/build-docker.yml

@@ -53,7 +53,7 @@ jobs:
       # Build Vue frontend
       - uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: '18'
           cache: yarn
           cache-dependency-path: vue/yarn.lock
       - name: Install dependencies

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
     # Build Vue frontend
     - uses: actions/setup-node@v3
       with:
-        node-version: '16'
+        node-version: '18'
     - name: Install Vue dependencies
       working-directory: ./vue
       run: yarn install

cookbook/helper/recipe_url_import.py

@@ -409,7 +409,7 @@ def parse_keywords(keyword_json, space):
     # retrieve keyword automation cache if it exists, otherwise build from database
     KEYWORD_CACHE_KEY = f'automation_keyword_alias_{space.pk}'
     if c := caches['default'].get(KEYWORD_CACHE_KEY, None):
-        self.food_aliases = c
+        keyword_aliases = c
         caches['default'].touch(KEYWORD_CACHE_KEY, 30)
     else:
         for a in Automation.objects.filter(space=space, disabled=False, type=Automation.KEYWORD_ALIAS).only('param_1', 'param_2').order_by('order').all():

cookbook/locale/de/LC_MESSAGES/django.po

@@ -15,10 +15,10 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-05-18 14:28+0200\n"
-"PO-Revision-Date: 2023-02-09 13:55+0000\n"
-"Last-Translator: Marion Kämpfer <marion@murphyslantech.de>\n"
-"Language-Team: German <http://translate.tandoor.dev/projects/tandoor/recipes-"
-"backend/de/>\n"
+"PO-Revision-Date: 2023-06-21 14:19+0000\n"
+"Last-Translator: Tobias Huppertz <tobias.huppertz@mail.de>\n"
+"Language-Team: German <http://translate.tandoor.dev/projects/tandoor/"
+"recipes-backend/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -600,9 +600,8 @@ msgid "Imported %s recipes."
 msgstr "%s Rezepte importiert."
 
 #: .\cookbook\integration\openeats.py:26
-#, fuzzy
 msgid "Recipe source:"
-msgstr "Rezept-Hauptseite"
+msgstr "Rezept-Quelle:"
 
 #: .\cookbook\integration\paprika.py:49
 msgid "Notes"

cookbook/migrations/0193_space_internal_note.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.9 on 2023-06-21 13:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0192_food_food_unique_open_data_slug_per_space_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='space',
+            name='internal_note',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

cookbook/models.py

@@ -270,6 +270,8 @@ class Space(ExportModelOperationsMixin('space'), models.Model):
     food_inherit = models.ManyToManyField(FoodInheritField, blank=True)
     show_facet_count = models.BooleanField(default=False)
 
+    internal_note = models.TextField(blank=True, null=True)
+
     def safe_delete(self):
         """
         Safely deletes a space by deleting all objects belonging to the space first and then deleting the space itself

cookbook/templates/base.html

@@ -118,6 +118,10 @@
                 <a class="nav-link" href="{% url 'view_books' %}"><i
                         class="fas fa-fw fa-book-open"></i> {% trans 'Books' %}</a>
             </li>
+            {% plugin_main_nav_templates as plugin_main_nav_templates %}
+            {% for pn in plugin_main_nav_templates %}
+                {% include pn %}
+            {% endfor %}
         </ul>
 
         <ul class="navbar-nav ml-auto">

cookbook/templatetags/custom_tags.py

@@ -140,6 +140,14 @@ def plugin_dropdown_nav_templates():
             templates.append(p['nav_dropdown'])
     return templates
 
+@register.simple_tag
+def plugin_main_nav_templates():
+    templates = []
+    for p in PLUGINS:
+        if p['nav_main']:
+            templates.append(p['nav_main'])
+    return templates
+
 
 @register.simple_tag
 def bookmarklet(request):

vue/package.json

@@ -40,7 +40,7 @@
     "vue-multiselect": "^2.1.6",
     "vue-property-decorator": "^9.1.2",
     "vue-sanitize": "^0.2.2",
-    "vue-simple-calendar": "5.0.1",
+    "vue-simple-calendar": "TandoorRecipes/vue-simple-calendar#lastvue2",
     "vue-template-compiler": "2.7.14",
     "vue2-touch-events": "^3.2.2",
     "vuedraggable": "^2.24.3",