partially working
This commit is contained in:
@ -114,7 +114,7 @@ def search_recipes(request, queryset, params):
|
|||||||
)
|
)
|
||||||
queryset = queryset.filter(query_filter).annotate(rank=search_rank)
|
queryset = queryset.filter(query_filter).annotate(rank=search_rank)
|
||||||
else:
|
else:
|
||||||
queryset = queryset.filter(query_filter)
|
queryset = queryset.filter(name__icontains=search_string)
|
||||||
|
|
||||||
if len(search_keywords) > 0:
|
if len(search_keywords) > 0:
|
||||||
if search_keywords_or == 'true':
|
if search_keywords_or == 'true':
|
||||||
|
@ -31,11 +31,12 @@ class Integration:
|
|||||||
"""
|
"""
|
||||||
self.request = request
|
self.request = request
|
||||||
self.export_type = export_type
|
self.export_type = export_type
|
||||||
self.keyword = Keyword.objects.create(
|
# TODO add all import keywords under the importer root node
|
||||||
|
self.keyword = Keyword.add_root(
|
||||||
name=f'Import {export_type} {date_format(datetime.datetime.now(), "DATETIME_FORMAT")}.{datetime.datetime.now().strftime("%S")}',
|
name=f'Import {export_type} {date_format(datetime.datetime.now(), "DATETIME_FORMAT")}.{datetime.datetime.now().strftime("%S")}',
|
||||||
description=f'Imported by {request.user.get_user_name()} at {date_format(datetime.datetime.now(), "DATETIME_FORMAT")}. Type: {export_type}',
|
description=f'Imported by {request.user.get_user_name()} at {date_format(datetime.datetime.now(), "DATETIME_FORMAT")}. Type: {export_type}',
|
||||||
icon='📥',
|
icon='📥',
|
||||||
space=request.space
|
space=request.space,
|
||||||
)
|
)
|
||||||
|
|
||||||
def do_export(self, recipes):
|
def do_export(self, recipes):
|
||||||
|
Reference in New Issue
Block a user