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

[Fixture] 增加 asset groups assets api

pull/417/head
ibuler 2017-04-01 00:41:16 +08:00
parent 067426d5e0
commit 66a2262ee9
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/perms/api.py
View File

@ -198,22 +198,35 @@ class MyAssetGroupAssetsApi(ListAPIView):
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
asset_groups = {} asset_groups = {}
# asset_group = {1: {'id': 1, 'name': 'hello', 'assets': set(), asset_groups[0] = {
# 'assets_id': set()}, 2: {}} 'id': 0, 'name': 'ungrouped', 'assets': []
}
# asset_group = {
# 1: {'id': 1, 'name': 'hello',
# 'assets': [{
# 'id': 'asset_id',
# 'system_users': [{'id': 'system_user_id',...},]
# }],
# 'assets_id': set()}, 2: {}}
user = request.user user = request.user
if user: if user:
assets = get_user_granted_assets(user) assets = get_user_granted_assets(user)
for asset in assets: for asset, system_users in assets.items():
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)
continue
for asset_group in asset.groups.all(): for asset_group in asset.groups.all():
if asset_group.id in asset_groups: if asset_group.id in asset_groups:
asset_groups[asset_group.id]['assets'].add(asset.to_json()) asset_groups[asset_group.id]['assets'].append(asset_json)
else: else:
asset_groups[asset_group.id] = { asset_groups[asset_group.id] = {
'id': asset_group.id, 'id': asset_group.id,
'name': asset_group.name, 'name': asset_group.name,
'comment': asset_group.comment, 'comment': asset_group.comment,
'assets': {asset.to_json()}, 'assets': [asset_json],
} }
asset_groups_json = asset_groups.values() asset_groups_json = asset_groups.values()
return Response(asset_groups_json, status=200) return Response(asset_groups_json, status=200)

6
apps/perms/urls/api_urls.py
View File

@ -19,12 +19,12 @@ urlpatterns = [
url(r'^v1/user/my/asset-groups/$', url(r'^v1/user/my/asset-groups/$',
api.MyGrantedAssetsGroupsApi.as_view(), api.MyGrantedAssetsGroupsApi.as_view(),
name='my-asset-groups'), name='my-asset-groups'),
url(r'^v1/user/my/asset-groups-assets/$',
api.MyAssetGroupAssetsApi.as_view(),
name='my-asset-group-assets'),
url(r'^v1/user/my/asset-group/(?P<pk>[0-9]+)/assets/$', url(r'^v1/user/my/asset-group/(?P<pk>[0-9]+)/assets/$',
api.MyAssetGroupOfAssetsApi.as_view(), api.MyAssetGroupOfAssetsApi.as_view(),
name='my-asset-group-of-assets'), name='my-asset-group-of-assets'),
url(r'^v1/user/my/asset-group-assets/$',
api.MyAssetGroupAssetsApi.as_view(),
name='my-asset-group-assets'),
# 查询某个用户授权的资产和资产组 # 查询某个用户授权的资产和资产组
url(r'^v1/user/(?P<pk>[0-9]+)/assets/$', url(r'^v1/user/(?P<pk>[0-9]+)/assets/$',

2
apps/users/templates/users/first_login_done.html
View File

@ -28,7 +28,7 @@
<div class="ibox-content"> <div class="ibox-content">
<div class="alert alert-success" id="messages"> <div class="alert alert-success" id="messages">
{% trans 'Welcome to use jumpserver, visit ' %} {% trans 'Welcome to use jumpserver, visit ' %}
<a href="{{ user_guide_url }}">{% trans 'Use guide' %}</a> {% trans ' for more information' %} <a href="{{ user_guide_url }}" target="_blank">{% trans 'Use guide' %}</a> {% trans ' for more information' %}
</div> </div>
</div> </div>
</div> </div>