mirror of
https://github.com/TandoorRecipes/recipes.git
synced 2025-12-28 12:39:36 -05:00
Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4c92a4b39c | ||
|
|
3dad5132bb | ||
|
|
7d7890445e | ||
|
|
cea015f23d | ||
|
|
3e8610912e | ||
|
|
ba80ca42e6 | ||
|
|
c413db5460 | ||
|
|
0e319ff293 | ||
|
|
88e3b22dcd | ||
|
|
19e2094ecd | ||
|
|
215989682b | ||
|
|
1af2211010 | ||
|
|
724d57ecd7 | ||
|
|
4b04fada51 | ||
|
|
4ad7043f91 |
@@ -250,7 +250,7 @@ msgstr ""
|
||||
|
||||
#: .\cookbook\helper\recipe_url_import.py:152
|
||||
msgid "Imported from "
|
||||
msgstr "Importiert von"
|
||||
msgstr "Importiert von "
|
||||
|
||||
#: .\cookbook\migrations\0047_auto_20200602_1133.py:12
|
||||
msgid "Breakfast"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -56,7 +56,7 @@
|
||||
<input type="file" @change="imageChanged">
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label for="id_name"> {% trans 'Preperation Time' %}</label>
|
||||
<label for="id_name"> {% trans 'Preparation Time' %}</label>
|
||||
<input class="form-control" id="id_prep_time" v-model="recipe.working_time">
|
||||
<br/>
|
||||
<label for="id_name"> {% trans 'Waiting Time' %}</label>
|
||||
|
||||
@@ -205,16 +205,15 @@ class RecipeViewSet(viewsets.ModelViewSet, StandardFilterMixin):
|
||||
permission_classes = [CustomIsShare | CustomIsGuest] # TODO split read and write permission for meal plan guest
|
||||
|
||||
def get_queryset(self):
|
||||
queryset = super().get_queryset()
|
||||
|
||||
internal = self.request.query_params.get('internal', None)
|
||||
if internal:
|
||||
queryset = queryset.filter(internal=True)
|
||||
self.queryset = self.queryset.filter(internal=True)
|
||||
random = self.request.query_params.get('random', False)
|
||||
if random:
|
||||
queryset = queryset.random(5)
|
||||
self.queryset = self.queryset.random(5)
|
||||
|
||||
return queryset
|
||||
return super().get_queryset()
|
||||
|
||||
# TODO write extensive tests for permissions
|
||||
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
bleach==3.2.1
|
||||
bleach-whitelist==0.0.11
|
||||
Django==3.1.1
|
||||
Django==3.1.3
|
||||
django-annoying==0.10.6
|
||||
django-autocomplete-light==3.5.1
|
||||
django-cleanup==4.0.0
|
||||
django-crispy-forms==1.9.1
|
||||
django-emoji-picker==0.0.6
|
||||
django-filter==2.4.0
|
||||
django-tables2==2.3.1
|
||||
django-tables2==2.3.3
|
||||
djangorestframework==3.11.0
|
||||
drf-writable-nested==0.6.1
|
||||
drf-writable-nested==0.6.2
|
||||
gunicorn==20.0.4
|
||||
lxml==4.5.1
|
||||
Markdown==3.2.2
|
||||
Markdown==3.3.3
|
||||
Pillow==7.1.2
|
||||
psycopg2-binary==2.8.6
|
||||
python-dotenv==0.15.0
|
||||
requests==2.23.0
|
||||
requests==2.25.0
|
||||
simplejson==3.17.2
|
||||
six==1.15.0
|
||||
webdavclient3==3.14.4
|
||||
|
||||
Reference in New Issue
Block a user