engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

helpers: flash messages can now carry additional information in json format

Browse source
This commit is contained in:
Marcin Lulek 2016-10-10 16:00:18 +02:00
parent ecc24326d7
commit 73c93af3e7
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
rhodecode/lib/helpers.py
View file

@ -682,14 +682,23 @@ class Flash(_Flash):
payloads = []
messages = flash.pop_messages()
if messages:
for message in messages:
payloads.append({
'message': {
'message': u'{}'.format(message.message),
'level': message.category,
'force': 'true'
}
})
for message in messages:
subdata = {}
if hasattr(message.message, 'rsplit'):
flash_data = message.message.rsplit('|DELIM|', 1)
org_message = flash_data[0]
if len(flash_data) > 1:
subdata = json.loads(flash_data[1])
else:
org_message = message.message
payloads.append({
'message': {
'message': u'{}'.format(org_message),
'level': message.category,
'force': True,
'subdata': subdata
}
})
return json.dumps(payloads)
flash = Flash()