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

Fix bug

pull/530/head
ibuler 2016-11-15 19:44:08 +08:00
parent db8b0022fc
commit 99c36f2a2c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/perms/api.py
View File

@ -133,7 +133,7 @@ class MyGrantedAssetsGroupsApi(APIView):
'id': asset_group.id, 'id': asset_group.id,
'name': asset_group.name, 'name': asset_group.name,
'comment': asset_group.comment, 'comment': asset_group.comment,
'asset_amount': 1 'assets_amount': 1
} }
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/users/templates/users/user_granted_asset.html
View File

@ -133,7 +133,7 @@
} }
}} }}
], ],
ajax_url: '{% url "perms:api-user-assets" %}', ajax_url: '{% url "perms:api-user-assets" pk=user.id %}',
columns: [{data: function(){return ""}}, {data: "hostname" }, {data: "ip" }, {data: "port"}, columns: [{data: function(){return ""}}, {data: "hostname" }, {data: "ip" }, {data: "port"},
{data: "system_users_join"}, {data: "is_active"}] {data: "system_users_join"}, {data: "is_active"}]
}; };
@ -148,8 +148,8 @@
$(td).html(detail_btn.replace('99991937', rowData.id)); $(td).html(detail_btn.replace('99991937', rowData.id));
}} }}
], ],
ajax_url: '{% url "perms:api-user-asset-groups" %}', ajax_url: '{% url "perms:api-user-asset-groups" pk=user.id %}',
columns: [{data: function(){return ""}}, {data: "name" }, {data: "asset_amount" }] columns: [{data: function(){return ""}}, {data: "name" }, {data: "assets_amount" }]
}; };
jumpserver.initDataTable(options); jumpserver.initDataTable(options);
jumpserver.initDataTable(options2); jumpserver.initDataTable(options2);

4
apps/users/templates/users/user_group_granted_asset.html
View File

@ -133,7 +133,7 @@
} }
}} }}
], ],
ajax_url: '{% url "perms:api-user-assets" %}', ajax_url: '{% url "perms:api-user-assets" pk=user.id %}',
columns: [{data: function(){return ""}}, {data: "hostname" }, {data: "ip" }, {data: "port"}, columns: [{data: function(){return ""}}, {data: "hostname" }, {data: "ip" }, {data: "port"},
{data: "system_users_join"}, {data: "is_active"}] {data: "system_users_join"}, {data: "is_active"}]
}; };
@ -148,7 +148,7 @@
$(td).html(detail_btn.replace('99991937', rowData.id)); $(td).html(detail_btn.replace('99991937', rowData.id));
}} }}
], ],
ajax_url: '{% url "perms:api-user-asset-groups" %}', ajax_url: '{% url "perms:api-user-asset-groups" pk=user.id %}',
columns: [{data: function(){return ""}}, {data: "name" }, {data: "asset_amount" }] columns: [{data: function(){return ""}}, {data: "name" }, {data: "asset_amount" }]
}; };
jumpserver.initDataTable(options); jumpserver.initDataTable(options);