diff options
author | Michael Wood <michael.g.wood@intel.com> | 2015-01-08 13:15:10 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-08 22:34:36 +0000 |
commit | ed9fa17467ad8f41c654187eb840d4b4e15d262d (patch) | |
tree | 21166f53d96811cc2c31f83c69a026eb2f97d53b /bitbake/lib/toaster/toastergui/templates | |
parent | 2e26745a134373dfde3aa2b16fef3df720436e77 (diff) | |
download | poky-ed9fa17467ad8f41c654187eb840d4b4e15d262d.tar.gz |
bitbake: toaster: Improve client side error handling
Make use of the toastermain.settings.DEBUG flag to toggle the client
side error logging. Make the error logging consistent by using
console.warn/error across the project, this adds traceability to the
warnings. Also handles the case where console is not available by
stubbing it in libtoaster.
(Bitbake rev: c34ebc51a6cbf90c64ef1ac461e475c6341f0f2a)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates')
4 files changed, 17 insertions, 12 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/base.html b/bitbake/lib/toaster/toastergui/templates/base.html index bc7a0ee436..e95b5e0cac 100644 --- a/bitbake/lib/toaster/toastergui/templates/base.html +++ b/bitbake/lib/toaster/toastergui/templates/base.html | |||
@@ -21,6 +21,11 @@ | |||
21 | </script> | 21 | </script> |
22 | <script src="{% static 'js/libtoaster.js' %}"> | 22 | <script src="{% static 'js/libtoaster.js' %}"> |
23 | </script> | 23 | </script> |
24 | {% if DEBUG %} | ||
25 | <script> | ||
26 | libtoaster.debug = true; | ||
27 | </script> | ||
28 | {% endif %} | ||
24 | <script src="{% static 'js/base.js' %}"></script> | 29 | <script src="{% static 'js/base.js' %}"></script> |
25 | {%if MANAGED %} | 30 | {%if MANAGED %} |
26 | <script> | 31 | <script> |
diff --git a/bitbake/lib/toaster/toastergui/templates/layers.html b/bitbake/lib/toaster/toastergui/templates/layers.html index ced54c2098..33160e5968 100644 --- a/bitbake/lib/toaster/toastergui/templates/layers.html +++ b/bitbake/lib/toaster/toastergui/templates/layers.html | |||
@@ -126,15 +126,15 @@ function _makeXHREditCall(data, onsuccess, onfail) { | |||
126 | headers: { 'X-CSRFToken' : $.cookie('csrftoken')}, | 126 | headers: { 'X-CSRFToken' : $.cookie('csrftoken')}, |
127 | success: function (_data) { | 127 | success: function (_data) { |
128 | if (_data.error != "ok") { | 128 | if (_data.error != "ok") { |
129 | alert(_data.error); | 129 | console.warn(_data.error); |
130 | } else { | 130 | } else { |
131 | updateButtons(_data.layers.map(function (e) {return e.id})); | 131 | updateButtons(_data.layers.map(function (e) {return e.id})); |
132 | if (onsuccess != undefined) onsuccess(_data); | 132 | if (onsuccess != undefined) onsuccess(_data); |
133 | } | 133 | } |
134 | }, | 134 | }, |
135 | error: function (_data) { | 135 | error: function (_data) { |
136 | alert("Call failed"); | 136 | console.warn("Call failed"); |
137 | console.log(_data); | 137 | console.warn(_data); |
138 | } | 138 | } |
139 | }); | 139 | }); |
140 | } | 140 | } |
@@ -215,7 +215,7 @@ function layerAdd(layerId, layerName, layerURL) { | |||
215 | data: {'type': 'layerdeps','value':layerId}, | 215 | data: {'type': 'layerdeps','value':layerId}, |
216 | success: function(_data) { | 216 | success: function(_data) { |
217 | if (_data.error != "ok") { | 217 | if (_data.error != "ok") { |
218 | alert(_data.error); | 218 | console.warn(_data.error); |
219 | } else { | 219 | } else { |
220 | updateLayerCountLabels(_data.list.length+1); | 220 | updateLayerCountLabels(_data.list.length+1); |
221 | 221 | ||
diff --git a/bitbake/lib/toaster/toastergui/templates/mrb_section.html b/bitbake/lib/toaster/toastergui/templates/mrb_section.html index 73031e2d1f..432955ab88 100644 --- a/bitbake/lib/toaster/toastergui/templates/mrb_section.html +++ b/bitbake/lib/toaster/toastergui/templates/mrb_section.html | |||
@@ -79,21 +79,21 @@ function _makeXHRBuildCall(url, data, onsuccess, onfail) { | |||
79 | headers: { 'X-CSRFToken' : $.cookie('csrftoken')}, | 79 | headers: { 'X-CSRFToken' : $.cookie('csrftoken')}, |
80 | success: function (_data) { | 80 | success: function (_data) { |
81 | if (_data.error != "ok") { | 81 | if (_data.error != "ok") { |
82 | alert(_data.error); | 82 | console.warn(_data.error); |
83 | } else { | 83 | } else { |
84 | if (onsuccess != undefined) onsuccess(_data); | 84 | if (onsuccess != undefined) onsuccess(_data); |
85 | } | 85 | } |
86 | }, | 86 | }, |
87 | error: function (_data) { | 87 | error: function (_data) { |
88 | alert("Call failed"); | 88 | console.warn("Call failed"); |
89 | console.log(_data); | 89 | console.warn(_data); |
90 | if (onfail) onfail(data); | 90 | if (onfail) onfail(data); |
91 | } }); | 91 | } }); |
92 | } | 92 | } |
93 | 93 | ||
94 | 94 | ||
95 | function scheduleBuild(url, projectName, buildlist) { | 95 | function scheduleBuild(url, projectName, buildlist) { |
96 | console.log("scheduleBuild"); | 96 | console.warn("scheduleBuild"); |
97 | _makeXHRBuildCall(url, {targets: buildlist.join(" ")}, function (_data) { | 97 | _makeXHRBuildCall(url, {targets: buildlist.join(" ")}, function (_data) { |
98 | 98 | ||
99 | $('#latest-builds').prepend('<div class="alert alert-info" style="padding-top:0px">' + '<span class="label label-info" style="font-weight: normal; margin-bottom: 5px; margin-left:-15px; padding-top:5px;">'+projectName+'</span><div class="row-fluid">' + | 99 | $('#latest-builds').prepend('<div class="alert alert-info" style="padding-top:0px">' + '<span class="label label-info" style="font-weight: normal; margin-bottom: 5px; margin-left:-15px; padding-top:5px;">'+projectName+'</span><div class="row-fluid">' + |
diff --git a/bitbake/lib/toaster/toastergui/templates/targets.html b/bitbake/lib/toaster/toastergui/templates/targets.html index f4313f92b2..cc339fbbb7 100644 --- a/bitbake/lib/toaster/toastergui/templates/targets.html +++ b/bitbake/lib/toaster/toastergui/templates/targets.html | |||
@@ -119,15 +119,15 @@ function _makeXHREditCall(data, onsuccess, onfail) { | |||
119 | headers: { 'X-CSRFToken' : $.cookie('csrftoken')}, | 119 | headers: { 'X-CSRFToken' : $.cookie('csrftoken')}, |
120 | success: function (_data) { | 120 | success: function (_data) { |
121 | if (_data.error != "ok") { | 121 | if (_data.error != "ok") { |
122 | alert(_data.error); | 122 | console.warn(_data.error); |
123 | } else { | 123 | } else { |
124 | updateButtons(_data.layers.map(function (e) {return e.id})); | 124 | updateButtons(_data.layers.map(function (e) {return e.id})); |
125 | if (onsuccess != undefined) onsuccess(_data); | 125 | if (onsuccess != undefined) onsuccess(_data); |
126 | } | 126 | } |
127 | }, | 127 | }, |
128 | error: function (_data) { | 128 | error: function (_data) { |
129 | alert("Call failed"); | 129 | console.warn("Call failed"); |
130 | console.log(_data); | 130 | console.warn(_data); |
131 | } | 131 | } |
132 | }); | 132 | }); |
133 | } | 133 | } |
@@ -202,7 +202,7 @@ function layerAdd(layerId, layerName, layerURL, pressedButtonId) { | |||
202 | data: {'type': 'layerdeps','value':layerId}, | 202 | data: {'type': 'layerdeps','value':layerId}, |
203 | success: function(_data) { | 203 | success: function(_data) { |
204 | if (_data.error != "ok") { | 204 | if (_data.error != "ok") { |
205 | alert(_data.error); | 205 | console.warn(_data.error); |
206 | } else { | 206 | } else { |
207 | updateLayerCountLabels(_data.list.length+1); | 207 | updateLayerCountLabels(_data.list.length+1); |
208 | 208 | ||