Skip to content

Commit

Permalink
Merge pull request voilet#5 from leemon9527/master
Browse files Browse the repository at this point in the history
生成主机修改记录的问题
  • Loading branch information
voilet authored Nov 21, 2016
2 parents 0b7af01 + 97a9e9f commit 2ec67e4
Showing 1 changed file with 14 additions and 3 deletions.
17 changes: 14 additions & 3 deletions assets/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,20 @@ def get_diff(obj1, obj2):
else:
d2_value = d2[k][0]
if not v:
v = u''
if str(v) != str(d2_value):
info.update({k: [v, d2_value]})
if v==False:
pass
else:
v = u''
if isinstance(v,list):
v.sort()
if not d2_value:
d2_value = []
d2_value.sort()
if v != d2_value:
info.update({k: [v, d2_value]})
else:
if str(v) != str(d2_value):
info.update({k: [v, d2_value]})

for k, v in info.items():
if v == [None, u'']:
Expand Down

0 comments on commit 2ec67e4

Please sign in to comment.