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

[Fixture] 添加首页

Browse Source
This commit is contained in:
ibuler
2017-04-02 18:09:40 +08:00
parent 66a2262ee9
commit 709552f14c
16 changed files with 597 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/perms/api.py
View File

@@ -197,7 +197,7 @@ class MyAssetGroupAssetsApi(ListAPIView):
permission_classes = (IsValidUser,)
def get(self, request, *args, **kwargs):
asset_groups = {}
asset_groups = dict()
asset_groups[0] = {
'id': 0, 'name': 'ungrouped', 'assets': []
}
@@ -216,7 +216,7 @@ class MyAssetGroupAssetsApi(ListAPIView):
asset_json = asset.to_json()
asset_json['system_users'] = [su.to_json() for su in system_users]
if not asset.groups.all():
asset_groups[0][assets].append(asset_json)
asset_groups[0]['assets'].append(asset_json)
continue
for asset_group in asset.groups.all():
if asset_group.id in asset_groups: