From c8277afef99352427f957784f1ab66f038abea7f Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 16 Jul 2013 16:14:51 +0200 Subject: [PATCH] Fix auto refresh error message (cherry picked from commit ba7be89ffcda58123c9b73ce2919e6cba829ab7a) --- src/sunstone/public/js/plugins/oneflow-services.js | 11 ++++++++++- src/sunstone/public/js/plugins/oneflow-templates.js | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/sunstone/public/js/plugins/oneflow-services.js b/src/sunstone/public/js/plugins/oneflow-services.js index ca92059b04..d4064a456a 100644 --- a/src/sunstone/public/js/plugins/oneflow-services.js +++ b/src/sunstone/public/js/plugins/oneflow-services.js @@ -1024,7 +1024,16 @@ var service_actions = { "Service.autorefresh" : { type: "custom", call: function() { - Service.list({timeout: true, success: updateServicesView, error: onError}); + Service.list({ + timeout: true, + success: function(request, service_list) { + $("#oneflow-services #error_message").hide(); + updateServicesView(request, service_list); + }, + error: function(request, error_json) { + onError(request, error_json, $("#oneflow-services #error_message")); + } + }); } }, diff --git a/src/sunstone/public/js/plugins/oneflow-templates.js b/src/sunstone/public/js/plugins/oneflow-templates.js index a11256d157..b0d45581f2 100644 --- a/src/sunstone/public/js/plugins/oneflow-templates.js +++ b/src/sunstone/public/js/plugins/oneflow-templates.js @@ -510,7 +510,16 @@ var service_template_actions = { "ServiceTemplate.autorefresh" : { type: "custom", call: function() { - ServiceTemplate.list({timeout: true, success: updateServiceTemplatesView, error: onError}); + ServiceTemplate.list({ + timeout: true, + success: function(request, service_list) { + $("#oneflow-templates #error_message").hide(); + updateServiceTemplatesView(request, service_list); + }, + error: function(request, error_json) { + onError(request, error_json, $("#oneflow-templates #error_message")); + } + }); } },