Skip to content
Snippets Groups Projects
Commit 0d4217fe authored by Prasad's avatar Prasad
Browse files

Fixes #1960: Ensure string message to bootbox and jQuery notify

parent e43131dd
No related branches found
No related tags found
No related merge requests found
......@@ -203,7 +203,7 @@ jQuery.Class("Vtiger_Helper_Js",{
bootbox.confirm({
title : title,
buttons: buttonsInfo,
message: data['message'],
message: typeof (data['message']) == "object" ? data.message : data['message'], /* error | string */
htmlSupportEnable: data.hasOwnProperty('htmlSupportEnable') ? data['htmlSupportEnable'] : true,
callback: function(result) {
if (result) {
......@@ -217,7 +217,7 @@ jQuery.Class("Vtiger_Helper_Js",{
return aDeferred.promise();
},
showAlertBox: function(data, cb) {
var message = data['message'];
var message = typeof (data['message']) == "object" ? data.message : data['message'], /* error | string */
if (typeof cb == 'function') {
bootbox.alert(message, cb);
}
......@@ -560,6 +560,8 @@ jQuery.Class("Vtiger_Helper_Js",{
'title' : app.vtranslate('JS_ALERT')
}
options = jQuery.extend(defaultOptions,options);
if (typeof (options['message']) == "object") { options.message = options['message'].message; }
jQuery.notify(options,settings);
},
......@@ -574,6 +576,9 @@ jQuery.Class("Vtiger_Helper_Js",{
}
options = jQuery.extend(defaultOptions, options);
settings = jQuery.extend(defaultSettings, settings);
if (typeof (options['message']) == "object") { options.message = options['message'].message; }
jQuery.notify(options,settings);
},
......@@ -583,6 +588,8 @@ jQuery.Class("Vtiger_Helper_Js",{
'title' : app.vtranslate('JS_SUCCESS')
}
options = jQuery.extend(defaultOptions, options);
if (typeof (options['message']) == "object") { options.message = options['message'].message; }
jQuery.notify(options,settings);
},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment