mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-09-23 20:39:26 +00:00
Fix rbac (#7728)
* perf: 重命名 signal handlers * fix: 修复 ticket processor 问题 * perf: 修改 ticket 处理人api * fix: 修复创建系统账号bug * fix: 升级celery_beat==2.2.1和flower==1.0.0;修改celery进程启动参数先后顺序 * perf: 修改 authentication token * fix: 修复上传权限bug * fix: 登录页面增加i18n切换; * fix: 系统角色删除限制 * perf: 修改一下 permissions tree * perf: 生成 i18n * perf: 修改一点点 Co-authored-by: ibuler <ibuler@qq.com> Co-authored-by: feng626 <1304903146@qq.com> Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
This commit is contained in:
@@ -2,7 +2,7 @@ from rest_framework.generics import RetrieveDestroyAPIView
|
||||
|
||||
from orgs.utils import tmp_to_root_org
|
||||
from ..serializers import SuperTicketSerializer
|
||||
from ..models import SuperTicket
|
||||
from ..models import Ticket
|
||||
|
||||
|
||||
__all__ = ['SuperTicketStatusAPI']
|
||||
@@ -10,11 +10,14 @@ __all__ = ['SuperTicketStatusAPI']
|
||||
|
||||
class SuperTicketStatusAPI(RetrieveDestroyAPIView):
|
||||
serializer_class = SuperTicketSerializer
|
||||
rbac_perms = {
|
||||
'GET': 'tickets.view_superticket',
|
||||
'DELETE': 'tickets.change_superticket'
|
||||
}
|
||||
|
||||
def get_queryset(self):
|
||||
with tmp_to_root_org():
|
||||
return SuperTicket.objects.all()
|
||||
return Ticket.objects.all()
|
||||
|
||||
def perform_destroy(self, instance):
|
||||
ticket = self.get_object()
|
||||
ticket.close(processor=ticket.applicant)
|
||||
instance.close(processor=instance.applicant)
|
||||
|
Reference in New Issue
Block a user