diff --git a/.github/workflows/build-docker-open-data.yml b/.github/workflows/build-docker-open-data.yml
index 09df1956..22b3af12 100644
--- a/.github/workflows/build-docker-open-data.yml
+++ b/.github/workflows/build-docker-open-data.yml
@@ -21,7 +21,7 @@ jobs:
suffix: ""
continue-on-error: false
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Get version number
id: get_version
@@ -43,7 +43,7 @@ jobs:
path: ./recipes/plugins/open_data_plugin
# Build Vue frontend
- - uses: actions/setup-node@v3
+ - uses: actions/setup-node@v4
with:
node-version: '18'
cache: yarn
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 8c29b9fe..b61169d5 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -21,7 +21,7 @@ jobs:
suffix: ""
continue-on-error: false
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Get version number
id: get_version
@@ -35,7 +35,7 @@ jobs:
fi
# Build Vue frontend
- - uses: actions/setup-node@v3
+ - uses: actions/setup-node@v4
with:
node-version: '18'
cache: yarn
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d5da9d82..3f81b1fb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
python-version: ['3.10']
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Set up Python 3.10
uses: actions/setup-python@v5
with:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 4166aae3..fcdd8926 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
@@ -25,7 +25,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init@v2
+ uses: github/codeql-action/init@v3
# Override language selection by uncommenting this and choosing your languages
with:
languages: python, javascript
@@ -47,6 +47,6 @@ jobs:
# make release
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v2
+ uses: github/codeql-action/analyze@v3
with:
languages: javascript, python
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 7a35555b..6956ee7f 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -9,8 +9,8 @@ jobs:
if: github.repository_owner == 'TandoorRecipes'
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-python@v4
+ - uses: actions/checkout@v4
+ - uses: actions/setup-python@v5
with:
python-version: 3.x
- run: pip install mkdocs-material mkdocs-include-markdown-plugin
diff --git a/README.md b/README.md
index 28dc83ed..4398c00f 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ Share some information on how you use Tandoor to help me improve the application
Beginning with version 0.10.0 the code in this repository is licensed under the [GNU AGPL v3](https://www.gnu.org/licenses/agpl-3.0.de.html) license with a
[common clause](https://commonsclause.com/) selling exception. See [LICENSE.md](https://github.com/vabene1111/recipes/blob/develop/LICENSE.md) for details.
-> NOTE: There appears to be a whole range of legal issues with licensing anything else then the standard completely open licenses.
+> NOTE: There appears to be a whole range of legal issues with licensing anything other than the standard completely open licenses.
> I am in the process of getting some professional legal advice to sort out these issues.
> Please also see [Issue 238](https://github.com/vabene1111/recipes/issues/238) for some discussion and **reasoning** regarding the topic.
diff --git a/boot.sh b/boot.sh
index 3faacad7..97a94f47 100644
--- a/boot.sh
+++ b/boot.sh
@@ -76,4 +76,4 @@ echo "Done"
chmod -R 755 /opt/recipes/mediafiles
-exec gunicorn -b :$TANDOOR_PORT --workers $GUNICORN_WORKERS --threads $GUNICORN_THREADS --access-logfile - --error-logfile - --log-level $GUNICORN_LOG_LEVEL recipes.wsgi
+exec gunicorn -b "[::]:$TANDOOR_PORT" --workers $GUNICORN_WORKERS --threads $GUNICORN_THREADS --access-logfile - --error-logfile - --log-level $GUNICORN_LOG_LEVEL recipes.wsgi
diff --git a/cookbook/forms.py b/cookbook/forms.py
index 2244acad..401fc9a5 100644
--- a/cookbook/forms.py
+++ b/cookbook/forms.py
@@ -495,7 +495,7 @@ class SpacePreferenceForm(forms.ModelForm):
class Meta:
model = Space
- fields = ('food_inherit', 'reset_food_inherit', 'use_plural')
+ fields = ('food_inherit', 'reset_food_inherit',)
help_texts = {
'food_inherit': _('Fields on food that should be inherited by default.'),
diff --git a/cookbook/helper/template_helper.py b/cookbook/helper/template_helper.py
index 016779a7..4db1f5bc 100644
--- a/cookbook/helper/template_helper.py
+++ b/cookbook/helper/template_helper.py
@@ -14,12 +14,14 @@ class IngredientObject(object):
unit = ""
food = ""
note = ""
+ numeric_amount = 0
def __init__(self, ingredient):
if ingredient.no_amount:
self.amount = ""
else:
self.amount = f"