mirror of https://github.com/jumpserver/jumpserver
feat: 修改command filter数据结构
parent
4d4a107101
commit
1a6597b572
|
@ -77,9 +77,13 @@ class AssetPlatformViewSet(ModelViewSet):
|
||||||
filter_fields = ['name', 'base']
|
filter_fields = ['name', 'base']
|
||||||
search_fields = ['name']
|
search_fields = ['name']
|
||||||
|
|
||||||
|
def get_permissions(self):
|
||||||
|
if self.request.method.lower() in ['get', 'options']:
|
||||||
|
self.permission_classes = (IsOrgAdmin,)
|
||||||
|
return super().get_permissions()
|
||||||
|
|
||||||
def check_object_permissions(self, request, obj):
|
def check_object_permissions(self, request, obj):
|
||||||
if request.method.lower() in ['delete', 'put', 'patch'] and \
|
if request.method.lower() in ['delete', 'put', 'patch'] and obj.internal:
|
||||||
obj.internal:
|
|
||||||
self.permission_denied(
|
self.permission_denied(
|
||||||
request, message={"detail": "Internal platform"}
|
request, message={"detail": "Internal platform"}
|
||||||
)
|
)
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
#
|
#
|
||||||
import re
|
import re
|
||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
from django.utils.translation import ugettext_lazy as _
|
|
||||||
|
|
||||||
from common.fields import ChoiceDisplayField
|
from common.fields import ChoiceDisplayField
|
||||||
from common.serializers import AdaptedBulkListSerializer
|
from common.serializers import AdaptedBulkListSerializer
|
||||||
|
@ -27,11 +26,20 @@ class CommandFilterSerializer(BulkOrgResourceModelSerializer):
|
||||||
|
|
||||||
|
|
||||||
class CommandFilterRuleSerializer(BulkOrgResourceModelSerializer):
|
class CommandFilterRuleSerializer(BulkOrgResourceModelSerializer):
|
||||||
serializer_choice_field = ChoiceDisplayField
|
# serializer_choice_field = ChoiceDisplayField
|
||||||
invalid_pattern = re.compile(r'[\.\*\+\[\\\?\{\}\^\$\|\(\)\#\<\>]')
|
invalid_pattern = re.compile(r'[\.\*\+\[\\\?\{\}\^\$\|\(\)\#\<\>]')
|
||||||
|
type_display = serializers.ReadOnlyField(source='get_type_display')
|
||||||
|
action_display = serializers.ReadOnlyField(source='get_action_display')
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = CommandFilterRule
|
model = CommandFilterRule
|
||||||
|
fields_mini = ['id']
|
||||||
|
fields_small = fields_mini + [
|
||||||
|
'type', 'type_display', 'content', 'priority',
|
||||||
|
'action', 'action_display',
|
||||||
|
'comment', 'created_by', 'date_created', 'date_updated'
|
||||||
|
]
|
||||||
|
fields_fk = ['filter']
|
||||||
fields = '__all__'
|
fields = '__all__'
|
||||||
list_serializer_class = AdaptedBulkListSerializer
|
list_serializer_class = AdaptedBulkListSerializer
|
||||||
|
|
||||||
|
|
|
@ -30,6 +30,7 @@ class JMSCSVRender(BaseRenderer):
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _gen_table(data, fields):
|
def _gen_table(data, fields):
|
||||||
|
data = data[:100]
|
||||||
yield ['*{}'.format(f.label) if f.required else f.label for f in fields]
|
yield ['*{}'.format(f.label) if f.required else f.label for f in fields]
|
||||||
|
|
||||||
for item in data:
|
for item in data:
|
||||||
|
|
Loading…
Reference in New Issue