Merge remote-tracking branch 'origin/Django' into Django
All checks were successful
CI / docker-ci (push) Has been skipped
All checks were successful
CI / docker-ci (push) Has been skipped
This commit is contained in:
@@ -192,5 +192,6 @@ def get_visible_data(current_user):
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
生产环境用于创建数据库结构的临时命令:
|
生产环境用于创建数据库结构的临时命令:
|
||||||
python manage.py shell -c "from elastic.es_connect import create_index_with_mapping; create_index_with_mapping()"
|
python manage.py shell -c "from elastic.es_connect import create_index_with_mapping; create_index_with_mapping()"
|
||||||
|
|||||||
@@ -1027,7 +1027,7 @@ def analytics_types_view(request):
|
|||||||
size_int = int(size) if size is not None else 10
|
size_int = int(size) if size is not None else 10
|
||||||
except Exception:
|
except Exception:
|
||||||
size_int = 10
|
size_int = 10
|
||||||
data = es_analytics_types(gte=gte, lte=lte, size=size_int)
|
data = es_analytics_types(gte=gte, lte=lte, limit=size_int)
|
||||||
return JsonResponse({"status": "success", "data": data})
|
return JsonResponse({"status": "success", "data": data})
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
return JsonResponse({"status": "error", "message": str(e)}, status=500)
|
return JsonResponse({"status": "error", "message": str(e)}, status=500)
|
||||||
|
|||||||
Reference in New Issue
Block a user