mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

fix tests and cleanup

Browse Source
This commit is contained in:
John Anderson
2020-06-29 14:34:42 -04:00
parent 1681dbfa39
commit f48a079ae6
11 changed files with 29 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
netbox/extras/api/serializers.py
View File

@@ -284,21 +284,12 @@ class ScriptSerializer(serializers.Serializer):
lookup_field='full_name',
lookup_url_kwarg='pk'
)
id = serializers.SerializerMethodField(read_only=True)
name = serializers.SerializerMethodField(read_only=True)
description = serializers.SerializerMethodField(read_only=True)
id = serializers.CharField(read_only=True, source="full_name")
name = serializers.CharField(read_only=True)
description = serializers.CharField(read_only=True)
vars = serializers.SerializerMethodField(read_only=True)
result = NestedJobResultSerializer()
def get_id(self, instance):
return '{}.{}'.format(instance.__module__, instance.__name__)
def get_name(self, instance):
return getattr(instance.Meta, 'name', instance.__name__)
def get_description(self, instance):
return getattr(instance.Meta, 'description', '')
def get_vars(self, instance):
return {
k: v.__class__.__name__ for k, v in instance._get_vars().items()

5
netbox/extras/api/views.py
View File

@@ -17,6 +17,7 @@ from extras.models import (
from extras.reports import get_report, get_reports
from extras.scripts import get_script, get_scripts, run_script
from utilities.api import IsAuthenticatedOrLoginNotRequired, ModelViewSet
from utilities.utils import copy_safe_request
from . import serializers
@@ -304,12 +305,12 @@ class ScriptViewSet(ViewSet):
script.full_name,
script_content_type,
request.user,
data=form.cleaned_data,
data=data,
request=copy_safe_request(request),
commit=commit
)
script.result = job_result
serializer = serializers.ScriptDetailSerializer(script)
serializer = serializers.ScriptDetailSerializer(script, context={'request': request})
return Response(serializer.data)