github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-01-06 08:04:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev

Browse Source
This commit is contained in:
wangyong
2015-12-05 16:15:33 +08:00
parent 2c3e681942 34ccaeb10f
commit 0f6f3bdb9a
7 changed files with 238 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jasset/views.py
View File

@@ -7,7 +7,7 @@ from jumpserver.models import Setting
from jasset.forms import AssetForm, IdcForm
from jasset.models import Asset, IDC, AssetGroup, ASSET_TYPE, ASSET_STATUS
from jperm.perm_api import get_group_asset_perm
from jperm.ansible_api import Tasks, MyRunner
from jperm.ansible_api import MyRunner
from jperm.perm_api import gen_resource