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

Merge pull request #2253 from jumpserver/dev 

Bugfix (#2252)
pull/2328/head
老广 2018-12-21 15:48:29 +08:00 committed by GitHub
parent 23bf2b0f8e e7725e6910
commit a14d6b298d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/common/models.py
View File

@ -45,10 +45,10 @@ class Setting(models.Model):
def cleaned_value(self): def cleaned_value(self):
try: try:
value = self.value value = self.value
if not isinstance(value, (str, bytes)):
return value
if self.encrypted: if self.encrypted:
value = signer.unsign(value) value = signer.unsign(value)
if not value:
return None
value = json.loads(value) value = json.loads(value)
return value return value
except json.JSONDecodeError: except json.JSONDecodeError:

4
apps/common/tree.py
View File

@ -49,7 +49,9 @@ class TreeNode:
return False return False
elif not self.isParent and other.isParent: elif not self.isParent and other.isParent:
return True return True
return self.id > other.id if self.pId != other.pId:
return self.pId > other.pId
return self.name > other.name
def __eq__(self, other): def __eq__(self, other):
return self.id == other.id return self.id == other.id