From 565d06025c5c478b71c3f2950306e439c24d3b53 Mon Sep 17 00:00:00 2001 From: Herman Liang Date: Fri, 24 Jun 2016 17:22:09 +0800 Subject: [PATCH] fix error when alert field is not exist in payload --- src/dashboard/Push/PushIndex.react.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/dashboard/Push/PushIndex.react.js b/src/dashboard/Push/PushIndex.react.js index 0cf46fe3e9..a203e8abc2 100644 --- a/src/dashboard/Push/PushIndex.react.js +++ b/src/dashboard/Push/PushIndex.react.js @@ -145,10 +145,14 @@ let getPushName = (pushData) => { payload = JSON.parse(payload); } catch(e) { } if (payload) { - if (typeof payload.alert === 'string') { - return payload.alert; + if (payload.hasOwnProperty('alert')) { + if (typeof payload.alert === 'string') { + return payload.alert; + } + return payload.alert ? JSON.stringify(payload.alert) : payload; + } else { + return ""; } - return payload.alert ? JSON.stringify(payload.alert) : payload; } } }