mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-09-21 19:38:07 +00:00
Asset favor (#3352)
* [Update] 拆分filter org * [Update] 修改session支持protocol搜索 * [Bugfix] 修复判断问题 * [Update] 支持收藏资产 * [update] 修改org resource queryset * [Update] 修改form serializer 对应的多对多字段 * [Bugfix] 修复其他组织取消收藏的bug * [Update] 去掉debug信息 * [Update] 修改remote app get queryset * [Update] 修改remote app get queryset * [Update] 修改没有授权时显示情况 * [Bugfix] 修复组织管理员查看用户权限失败问题 * [Update] 优化forms assets queryset设置
This commit is contained in:
@@ -5,12 +5,12 @@ from rest_framework.viewsets import ModelViewSet
|
||||
from rest_framework_bulk import BulkModelViewSet
|
||||
from common.mixins import CommonApiMixin
|
||||
|
||||
from ..utils import set_to_root_org
|
||||
from ..utils import set_to_root_org, filter_org_queryset
|
||||
from ..models import Organization
|
||||
|
||||
__all__ = [
|
||||
'RootOrgViewMixin', 'OrgMembershipModelViewSetMixin', 'OrgModelViewSet',
|
||||
'OrgBulkModelViewSet',
|
||||
'OrgBulkModelViewSet', 'OrgQuerySetMixin',
|
||||
]
|
||||
|
||||
|
||||
@@ -22,7 +22,15 @@ class RootOrgViewMixin:
|
||||
|
||||
class OrgQuerySetMixin:
|
||||
def get_queryset(self):
|
||||
queryset = super().get_queryset().all()
|
||||
if hasattr(self, 'model'):
|
||||
queryset = self.model.objects.all()
|
||||
else:
|
||||
assert self.queryset is None, (
|
||||
"'%s' should not include a `queryset` attribute"
|
||||
% self.__class__.__name__
|
||||
)
|
||||
queryset = super().get_queryset()
|
||||
|
||||
if hasattr(self, 'swagger_fake_view'):
|
||||
return queryset[:1]
|
||||
if hasattr(self, 'action') and self.action == 'list' and \
|
||||
|
Reference in New Issue
Block a user