X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=scripts%2Fgenerate_client_js_actions.tpl;h=467344fbd8da3fa533ca784b4f03591e8cade2c4;hb=eacebf8a165d03444aeff7a2897b4cd7a5cbcc9c;hp=a29b3258785ef7874d651c157f9703ded212e894;hpb=4b1bcc4753f0a4870b4abb8053a63c548896c5e3;p=kivitendo-erp.git diff --git a/scripts/generate_client_js_actions.tpl b/scripts/generate_client_js_actions.tpl index a29b32587..467344fbd 100644 --- a/scripts/generate_client_js_actions.tpl +++ b/scripts/generate_client_js_actions.tpl @@ -35,16 +35,19 @@ ns.eval_json_result = function(data) { if (data.error) return ns.display_flash('error', data.error); - $(['info', 'warning', 'error']).each(function(idx, category) { - $('#flash_' + category).hide(); - $('#flash_detail_' + category).hide(); - $('#flash_' + category + '_disp').hide(); - $('#flash_' + category + '_content').empty(); - $('#flash_' + category + '_detail').empty(); - }); - - if ((data.js || '') != '') + if (!data.no_flash_clear) { + $(['info', 'warning', 'error']).each(function(idx, category) { + $('#flash_' + category).hide(); + $('#flash_detail_' + category).hide(); + $('#flash_' + category + '_disp').hide(); + $('#flash_' + category + '_content').empty(); + $('#flash_' + category + '_detail').empty(); + }); + } + if ((data.js || '') !== '') + // jshint -W061 eval(data.js); + // jshint +W061 if (data.eval_actions) $(data.eval_actions).each(function(idx, action) {