From 01b4ba5d6b4958bafb15c62970ee9ef465f1f1fa Mon Sep 17 00:00:00 2001
From: Doflatango <heshitan@sunteng.com>
Date: Fri, 10 Mar 2017 11:58:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=B7=E6=B1=82=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E9=BB=98=E8=AE=A4=E5=A4=84=E7=90=86=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/ui/src/components/JobEdit.vue   | 2 +-
 web/ui/src/libraries/rest-client.js | 2 +-
 web/ui/src/main.js                  | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/web/ui/src/components/JobEdit.vue b/web/ui/src/components/JobEdit.vue
index 1d0134b..aa8217a 100644
--- a/web/ui/src/components/JobEdit.vue
+++ b/web/ui/src/components/JobEdit.vue
@@ -158,7 +158,7 @@ export default {
             }
           }
         }).
-        onfailed((data)=>{vm.error = data.error}).
+        onfailed((msg)=>{vm.error = msg}).
         do();
     }
 
diff --git a/web/ui/src/libraries/rest-client.js b/web/ui/src/libraries/rest-client.js
index 3e980d1..a2d022f 100644
--- a/web/ui/src/libraries/rest-client.js
+++ b/web/ui/src/libraries/rest-client.js
@@ -3,7 +3,7 @@ var sendXHR = function(opt) {
   xhr.open(opt.method, opt.url, true);
 
   if (typeof opt.onexception == 'function') {
-    var warpExceptionHandler = ()=>{
+    var warpExceptionHandler = (msg)=>{
       opt.onexception(msg);
       typeof opt.onend == 'function' && opt.onend(xhr);
     }
diff --git a/web/ui/src/main.js b/web/ui/src/main.js
index 3fb4f97..53df2cf 100644
--- a/web/ui/src/main.js
+++ b/web/ui/src/main.js
@@ -14,8 +14,9 @@ const RestApi = (Vue, options)=>{
 Vue.use(RestApi);
 
 // global event bus
+var bus = new Vue();
 Vue.use((Vue)=>{
-  Vue.prototype.$bus = new Vue();
+  Vue.prototype.$bus = bus;
 });
 
 import VueRouter from 'vue-router';
@@ -57,6 +58,9 @@ restApi.GET('configurations').onsucceed(200, (resp)=>{
   }
   Vue.use(Config);
 
+  restApi.defaultExceptionHandler = (msg)=>{bus.$emit('error', msg)};
+  restApi.defaultFailedHandler = (msg)=>{bus.$emit('error', msg)};
+  
   var app = new Vue({
     el: '#app',
     render: h => h(App),