xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-10-31 03:12:31 +00:00
Code Issues Projects Releases Wiki Activity

[merge-LXCA] fix problem in merge with upstream - htmlify the dict

Browse Source 
Details:
Revision: d9cc888e68abe7794ade82a251c4dffe9108a014
Author: Michael Du <duxd2@LENOVO.COM>
Date: 2017/8/2 21:06:22
This commit is contained in:
Zhou Guangjun
2021-05-26 10:30:59 +08:00
parent 7363af866f
commit 32c84993b0
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
confluent_server/confluent/messages.py
View File

@@ -199,6 +199,8 @@ class ConfluentMessage(object):
notes.append('Broken because of %s' % val['broken'])
elif val is not None and 'expression' in val:
value = val['expression']
elif isinstance(val, dict):
value = _htmlify_structure(val)
if value is None:
value = ''
if val is not None and value == '' and 'isset' in val and val[
@@ -298,6 +300,7 @@ class DeletedResource(ConfluentMessage):
notnode = True
def __init__(self, resource):
self.myargs = [resource]
self.desc = 'Delete Resource'
self.kvpairs = {'deleted': resource}
def strip_node(self, node):
@@ -310,6 +313,7 @@ class CreatedResource(ConfluentMessage):
def __init__(self, resource):
self.myargs = [resource]
self.desc = 'Create Resource'
self.kvpairs = {'created': resource}
def strip_node(self, node):