cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed integration

Browse Source
This commit is contained in:
vabene1111
2021-08-22 13:54:33 +02:00
parent 4b3fa1a4b5
commit d744da2c3d
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cookbook/integration/integration.py
View File

@ -31,17 +31,15 @@ class Integration:
""" """
self.request = request self.request = request
self.export_type = export_type self.export_type = export_type
name = f'Import {export_type}'
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 = '📥'
count = Keyword.objects.filter(name__icontains=name, space=request.space).count() count = Keyword.objects.filter(name__icontains='Import', space=request.space).count()
if count != 0: name = f'Import {count + 1}'
pk = Keyword.objects.filter(name__icontains=name, space=request.space).order_by('id').first().id
name = name + " " + str(pk)
if DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2', 'django.db.backends.postgresql']: if DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2', 'django.db.backends.postgresql']:
parent = Keyword.objects.get_or_create(name='Import', space=request.space) parent, created = Keyword.objects.get_or_create(name='Import', space=request.space)
parent.add_child( self.keyword = parent.add_child(
name=name, name=name,
description=description, description=description,
icon=icon, icon=icon,

2
vue/src/components/GenericMultiselect.vue
View File

@ -39,7 +39,7 @@ export default {
limit: { limit: {
type: Number, type: Number,
default: 10, default: 10,
} },
sticky_options: {type:Array, default(){return []}}, sticky_options: {type:Array, default(){return []}},
initial_selection: {type:Array, default(){return []}}, initial_selection: {type:Array, default(){return []}},
multiple: {type: Boolean, default: true}, multiple: {type: Boolean, default: true},