summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/toastergui/static
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2015-07-31 15:09:07 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-01 11:26:11 +0100
commit1b13222e1c031d29419781e41956bedf643ebd74 (patch)
treedb1bc8ea9fa2ea54d888c7cfe5d356c025fb5ffa /bitbake/lib/toaster/toastergui/static
parentdf999d2ac162a5be3a65ac4ce771a7466aab2bdb (diff)
downloadpoky-1b13222e1c031d29419781e41956bedf643ebd74.tar.gz
bitbake: toastergui: Standardise the layer object property layerdetailurl
To be able to use the utility functions in libtoaster we need to have a single property name for the value that represents the url for the layer details in the layer object. (Bitbake rev: 4d64fd0d1236d342b29537f601a68cd23a8255ea) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/static')
-rw-r--r--bitbake/lib/toaster/toastergui/static/js/importlayer.js6
-rw-r--r--bitbake/lib/toaster/toastergui/static/js/layerdetails.js2
-rw-r--r--bitbake/lib/toaster/toastergui/static/js/libtoaster.js4
3 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/importlayer.js b/bitbake/lib/toaster/toastergui/static/js/importlayer.js
index df48e84876..560e25a01c 100644
--- a/bitbake/lib/toaster/toastergui/static/js/importlayer.js
+++ b/bitbake/lib/toaster/toastergui/static/js/importlayer.js
@@ -50,7 +50,7 @@ function importLayerPageInit (ctx) {
50 newLayerDep.children("span").tooltip(); 50 newLayerDep.children("span").tooltip();
51 51
52 var link = newLayerDep.children("a"); 52 var link = newLayerDep.children("a");
53 link.attr("href", currentLayerDepSelection.layerDetailsUrl); 53 link.attr("href", currentLayerDepSelection.layerdetailurl);
54 link.text(currentLayerDepSelection.name); 54 link.text(currentLayerDepSelection.name);
55 link.tooltip({title: currentLayerDepSelection.tooltip, placement: "right"}); 55 link.tooltip({title: currentLayerDepSelection.tooltip, placement: "right"});
56 56
@@ -65,10 +65,10 @@ function importLayerPageInit (ctx) {
65 65
66 $("#layer-deps-list").append(newLayerDep); 66 $("#layer-deps-list").append(newLayerDep);
67 67
68 libtoaster.getLayerDepsForProject(currentLayerDepSelection.layerDetailsUrl, function (data){ 68 libtoaster.getLayerDepsForProject(currentLayerDepSelection.layerdetailurl, function (data){
69 /* These are the dependencies of the layer added as a dependency */ 69 /* These are the dependencies of the layer added as a dependency */
70 if (data.list.length > 0) { 70 if (data.list.length > 0) {
71 currentLayerDepSelection.url = currentLayerDepSelection.layerDetailsUrl; 71 currentLayerDepSelection.url = currentLayerDepSelection.layerdetailurl;
72 layerDeps[currentLayerDepSelection.id].deps = data.list; 72 layerDeps[currentLayerDepSelection.id].deps = data.list;
73 } 73 }
74 74
diff --git a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js
index e522373b3f..291ed98c34 100644
--- a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js
+++ b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js
@@ -78,7 +78,7 @@ function layerDetailsPageInit (ctx) {
78 newLayerDep.children("span").tooltip(); 78 newLayerDep.children("span").tooltip();
79 79
80 var link = newLayerDep.children("a"); 80 var link = newLayerDep.children("a");
81 link.attr("href", currentLayerDepSelection.layerDetailsUrl); 81 link.attr("href", currentLayerDepSelection.layerdetailurl);
82 link.text(currentLayerDepSelection.name); 82 link.text(currentLayerDepSelection.name);
83 link.tooltip({title: currentLayerDepSelection.tooltip, placement: "right"}); 83 link.tooltip({title: currentLayerDepSelection.tooltip, placement: "right"});
84 84
diff --git a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js
index 667aca20ff..0000c572ac 100644
--- a/bitbake/lib/toaster/toastergui/static/js/libtoaster.js
+++ b/bitbake/lib/toaster/toastergui/static/js/libtoaster.js
@@ -225,7 +225,7 @@ var libtoaster = (function (){
225 function _addRmLayer(layerObj, add, doneCb){ 225 function _addRmLayer(layerObj, add, doneCb){
226 if (add === true) { 226 if (add === true) {
227 /* If adding get the deps for this layer */ 227 /* If adding get the deps for this layer */
228 libtoaster.getLayerDepsForProject(layerObj.url, 228 libtoaster.getLayerDepsForProject(layerObj.layerdetailurl,
229 function (layers) { 229 function (layers) {
230 230
231 /* got result for dependencies */ 231 /* got result for dependencies */
@@ -285,7 +285,7 @@ var libtoaster = (function (){
285 } 285 }
286 286
287 alertMsg.children("#layer-affected-name").text(layer.name); 287 alertMsg.children("#layer-affected-name").text(layer.name);
288 alertMsg.children("#layer-affected-name").attr("href", layer.url); 288 alertMsg.children("#layer-affected-name").attr("href", layer.layerdetailurl);
289 alertMsg.children("#project-affected-name").text(libtoaster.ctx.projectName); 289 alertMsg.children("#project-affected-name").text(libtoaster.ctx.projectName);
290 alertMsg.children("#project-affected-name").attr("href", libtoaster.ctx.projectPageUrl); 290 alertMsg.children("#project-affected-name").attr("href", libtoaster.ctx.projectPageUrl);
291 291