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

[Bugfix] 修复资产列表导入，资产id问题

pull/1240/head
BaiJiangjie 2018-04-24 16:15:04 +08:00
parent c37414045b
commit 2823d02763
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/assets/views/asset.py
View File

@ -304,7 +304,10 @@ class BulkImportAssetView(AdminUserRequiredMixin, JSONResponseMixin, FormView):
if v != '': if v != '':
asset_dict[k] = v asset_dict[k] = v
asset = get_object_or_none(Asset, id=asset_dict.pop('id', 0)) asset = None
asset_id = asset_dict.pop('id', None)
if asset_id:
asset = get_object_or_none(Asset, id=asset_id)
if not asset: if not asset:
try: try:
if len(Asset.objects.filter(hostname=asset_dict.get('hostname'))): if len(Asset.objects.filter(hostname=asset_dict.get('hostname'))):