github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'lina' of github.com:jumpserver/jumpserver into lina

pull/4019/head
ibuler 2020-05-13 11:06:24 +08:00
parent 17163dd909 b789a8bb05
commit 154aad1e22
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/api/asset.py
View File

@ -33,7 +33,7 @@ class AssetViewSet(OrgBulkModelViewSet):
API endpoint that allows Asset to be viewed or edited. API endpoint that allows Asset to be viewed or edited.
""" """
model = Asset model = Asset
filter_fields = ("hostname", "ip", "systemuser__id", "admin_user__id") filter_fields = ("hostname", "ip", "systemuser__id", "admin_user__id", "platform__base")
search_fields = ("hostname", "ip") search_fields = ("hostname", "ip")
ordering_fields = ("hostname", "ip", "port", "cpu_cores") ordering_fields = ("hostname", "ip", "port", "cpu_cores")
serializer_classes = { serializer_classes = {

3
apps/assets/api/asset_user.py
View File

@ -84,12 +84,15 @@ class AssetUserViewSet(CommonApiMixin, BulkModelViewSet):
def get_object(self): def get_object(self):
pk = self.kwargs.get("pk") pk = self.kwargs.get("pk")
if pk is None:
return
queryset = self.get_queryset() queryset = self.get_queryset()
obj = queryset.get(id=pk) obj = queryset.get(id=pk)
return obj return obj
def get_exception_handler(self): def get_exception_handler(self):
def handler(e, context): def handler(e, context):
logger.error(e, exc_info=True)
return Response({"error": str(e)}, status=400) return Response({"error": str(e)}, status=400)
return handler return handler