github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-21 03:19:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge with master

Browse Source
This commit is contained in:
ibuler
2016-10-28 15:09:38 +08:00
parent 374dfbdac2
commit 92251f2a45
4 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/audits/models.py
View File

@@ -82,7 +82,10 @@ class CommandLog(models.Model):
@property
def output_decode(self):
return base64.b64decode(self.output).replace('\n', '<br />')
try:
return base64.b64decode(self.output).replace('\n', '<br />')
except UnicodeDecodeError:
return 'UnicodeDecodeError'
class Meta:
db_table = 'command_log'