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

fix: ticket bug (#8584) 

Co-authored-by: feng626 <1304903146@qq.com>
pull/8586/head
fit2bot 2022-07-13 15:48:55 +08:00 committed by GitHub
parent 11e538d417
commit 2abca39597
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/tickets/api/ticket.py
View File

@ -29,7 +29,8 @@ class TicketViewSet(CommonApiMixin, viewsets.ModelViewSet):
serializer_class = serializers.TicketDisplaySerializer serializer_class = serializers.TicketDisplaySerializer
serializer_classes = { serializer_classes = {
'list': serializers.TicketListSerializer, 'list': serializers.TicketListSerializer,
'open': serializers.TicketApplySerializer 'open': serializers.TicketApplySerializer,
'approve': serializers.TicketApproveSerializer
} }
model = Ticket model = Ticket
perm_model = Ticket perm_model = Ticket

4
apps/tickets/migrations/0016_auto_20220609_1758.py
View File

@ -139,7 +139,7 @@ class Migration(migrations.Migration):
('ticket_ptr', ('ticket_ptr',
models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True,
primary_key=True, serialize=False, to='tickets.ticket')), primary_key=True, serialize=False, to='tickets.ticket')),
('apply_permission_name', models.CharField(max_length=128, verbose_name='Apply name')), ('apply_permission_name', models.CharField(max_length=128, verbose_name='Permission name')),
('apply_actions', models.IntegerField( ('apply_actions', models.IntegerField(
choices=[(255, 'All'), (1, 'Connect'), (2, 'Upload file'), (4, 'Download file'), choices=[(255, 'All'), (1, 'Connect'), (2, 'Upload file'), (4, 'Download file'),
(6, 'Upload download'), (8, 'Clipboard copy'), (16, 'Clipboard paste'), (6, 'Upload download'), (8, 'Clipboard copy'), (16, 'Clipboard paste'),
@ -162,7 +162,7 @@ class Migration(migrations.Migration):
('ticket_ptr', ('ticket_ptr',
models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True,
primary_key=True, serialize=False, to='tickets.ticket')), primary_key=True, serialize=False, to='tickets.ticket')),
('apply_permission_name', models.CharField(max_length=128, verbose_name='Apply name')), ('apply_permission_name', models.CharField(max_length=128, verbose_name='Permission name')),
('apply_category', ('apply_category',
models.CharField(choices=[('db', 'Database'), ('remote_app', 'Remote app'), ('cloud', 'Cloud')], models.CharField(choices=[('db', 'Database'), ('remote_app', 'Remote app'), ('cloud', 'Cloud')],
max_length=16, verbose_name='Category')), max_length=16, verbose_name='Category')),

9
apps/tickets/serializers/ticket/ticket.py
View File

@ -9,7 +9,7 @@ from tickets.models import Ticket, TicketFlow
from tickets.const import TicketType from tickets.const import TicketType
__all__ = [ __all__ = [
'TicketDisplaySerializer', 'TicketApplySerializer', 'TicketListSerializer' 'TicketDisplaySerializer', 'TicketApplySerializer', 'TicketListSerializer', 'TicketApproveSerializer'
] ]
@ -59,6 +59,13 @@ class TicketDisplaySerializer(TicketSerializer):
read_only_fields = fields read_only_fields = fields
class TicketApproveSerializer(TicketSerializer):
class Meta:
model = Ticket
fields = TicketSerializer.Meta.fields
read_only_fields = fields
class TicketApplySerializer(TicketSerializer): class TicketApplySerializer(TicketSerializer):
org_id = serializers.CharField( org_id = serializers.CharField(
required=True, max_length=36, allow_blank=True, label=_("Organization") required=True, max_length=36, allow_blank=True, label=_("Organization")