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

fix asset upload bug

pull/147/head
wangyong 2016-03-23 11:56:32 +08:00
parent 300e106143
commit 231f961945
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jasset/asset_api.py
View File

@ -290,6 +290,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: