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

Merge pull request #142 from jumpserver/bug_asset_upload 

fix asset upload bug
pull/146/head
ibuler 2016-03-22 18:03:00 +08:00
parent 4dbc6803fb a1e947ae1e
commit 267c1cd696
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jasset/asset_api.py
View File

@ -288,6 +288,8 @@ def excel_to_db(excel_file):
ip, port, hostname, use_default_auth, username, password, group = row ip, port, hostname, use_default_auth, username, password, group = row
if get_object(Asset, hostname=hostname): if get_object(Asset, hostname=hostname):
continue continue
if isinstance(password, int) or isinstance(password, float):
password = unicode(int(password))
use_default_auth = 1 if use_default_auth == u'默认' else 0 use_default_auth = 1 if use_default_auth == u'默认' else 0
password_encode = CRYPTOR.encrypt(password) if password else '' password_encode = CRYPTOR.encrypt(password) if password else ''
if hostname: if hostname:
@ -311,7 +313,6 @@ def excel_to_db(excel_file):
def get_ansible_asset_info(asset_ip, setup_info): def get_ansible_asset_info(asset_ip, setup_info):
print setup_info, '***'
disk_need = {} disk_need = {}
disk_all = setup_info.get("ansible_devices") disk_all = setup_info.get("ansible_devices")
if disk_all: if disk_all: