mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-07 23:28:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed recipe book entry remove

Browse Source
This commit is contained in:
vabene1111
2021-06-07 17:12:00 +02:00
parent 3074d916dc
commit 94c51f90cd
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cookbook/models.py
View File

@@ -1,3 +1,4 @@
import operator
import re import re
import uuid import uuid
from datetime import date, timedelta from datetime import date, timedelta
@@ -53,9 +54,11 @@ class PermissionModelMixin:
def get_space(self): def get_space(self):
p = '.'.join(self.get_space_key()) p = '.'.join(self.get_space_key())
if getattr(self, p, None): try:
return getattr(self, p) if space := operator.attrgetter(p)(self):
raise NotImplementedError('get space for method not implemented and standard fields not available') return space
except AttributeError:
raise NotImplementedError('get space for method not implemented and standard fields not available')
class Space(ExportModelOperationsMixin('space'), models.Model): class Space(ExportModelOperationsMixin('space'), models.Model):

2
cookbook/templates/base.html
View File

@@ -140,7 +140,7 @@
{% page_help request.resolver_match.url_name as help_button %} {% page_help request.resolver_match.url_name as help_button %}
{% if help_button %}{{ help_button|safe }}{% endif %} {% if help_button %}{{ help_button|safe }}{% endif %}
<li class="nav-item dropdown {% if request.resolver_match.url_name in 'view_settings,view_history,view_system,docs_markdown' %}active{% endif %}"> <li class="nav-item dropdown {% if request.resolver_match.url_name in 'view_space,view_settings,view_history,view_system,docs_markdown' %}active{% endif %}">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false"><i aria-haspopup="true" aria-expanded="false"><i
class="fas fa-user-alt"></i> {{ user.get_user_name }} class="fas fa-user-alt"></i> {{ user.get_user_name }}

12
cookbook/views/data.py
View File

@@ -148,13 +148,11 @@ def import_url(request):
recipe.steps.add(step) recipe.steps.add(step)
for kw in data['keywords']: for kw in data['keywords']:
# if k := Keyword.objects.filter(name=kw['text'], space=request.space).first(): if k := Keyword.objects.filter(name=kw['text'], space=request.space).first():
# recipe.keywords.add(k) recipe.keywords.add(k)
# elif data['all_keywords']: elif data['all_keywords']:
# k = Keyword.objects.create(name=kw['text'], space=request.space) k = Keyword.objects.create(name=kw['text'], space=request.space)
# recipe.keywords.add(k) recipe.keywords.add(k)
k, created = Keyword.objects.get_or_create(name=kw['text'].strip(), space=request.space)
recipe.keywords.add(k)
for ing in data['recipeIngredient']: for ing in data['recipeIngredient']:
ingredient = Ingredient() ingredient = Ingredient()