github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-22 08:19:04 +00:00
Code Issues Projects Releases Wiki Activity

prepare change api name

Browse Source
This commit is contained in:
ibuler
2016-11-16 17:38:03 +08:00
parent aa08f0aa48
commit a5e487441f
10 changed files with 110 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/perms/api.py
View File

@@ -21,7 +21,7 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
def get_queryset(self):
queryset = super(AssetPermissionViewSet, self).get_queryset()
user_id = self.request.query_params.get('user', '')
user_group_id = self.request.query_params.get('user-group', '')
user_group_id = self.request.query_params.get('user_group', '')
if user_id and user_id.isdigit():
user = get_object_or_404(User, id=int(user_id))
@@ -165,7 +165,7 @@ class UserGroupGrantedAssetsApi(ListAPIView):
user_group_id = self.kwargs.get('pk', '')
if user_group_id:
user_group = get_object_or_404(User, id=user_group_id)
user_group = get_object_or_404(UserGroup, id=user_group_id)
queryset = get_user_group_granted_assets(user_group)
else:
queryset = []
@@ -180,7 +180,7 @@ class UserGroupGrantedAssetGroupsApi(ListAPIView):
user_group_id = self.kwargs.get('pk', '')
if user_group_id:
user_group = get_object_or_404(User, id=user_group_id)
user_group = get_object_or_404(UserGroup, id=user_group_id)
queryset = get_user_group_granted_asset_groups(user_group)
else:
queryset = []