sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: toaster: Switch front end to use Layer get REST API 

Switch the front end to use the proper REST API for retrieving layer
information.

(Bitbake rev: 5ea25c49091f4d4b5007af948e063ed25ba5766f)

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Michael Wood 2016-12-09 16:52:53 +00:00 committed by Richard Purdie
parent ccb36cc549
commit 6f3d33c293
5 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bitbake/lib/toaster/toastergui/static/js/libtoaster.js
View File

@ -274,9 +274,13 @@ var libtoaster = (function () {
}
function _addRmLayer(layerObj, add, doneCb){
if (layerObj.xhrLayerUrl === undefined){
throw("xhrLayerUrl is undefined")
}
if (add === true) {
/* If adding get the deps for this layer */
libtoaster.getLayerDepsForProject(layerObj.layerdetailurl,
libtoaster.getLayerDepsForProject(layerObj.xhrLayerUrl,
function (layers) {
/* got result for dependencies */

15
bitbake/lib/toaster/toastergui/templates/layer_btn.html
View File

@ -1,4 +1,9 @@
<a class="btn btn-danger btn-block layer-exists-{{data.pk}} layerbtn" data-layer='{ "id": {{data.pk}}, "name": "{{data.layer.name}}", "layerdetailurl": "{%url 'layerdetails' extra.pid data.pk%}"}' data-directive="remove"
<a class="btn btn-danger btn-block layer-exists-{{data.pk}} layerbtn" data-layer='{
"id": {{data.pk}},
"name": "{{data.layer.name}}",
"xhrLayerUrl": "{% url "xhr_layer" extra.pid data.pk %}",
"layerdetailurl": "{% url 'layerdetails' extra.pid data.pk %}"
}' data-directive="remove"
{% if data.pk not in extra.current_layers %}
style="display:none;"
{% endif %}
@ -6,7 +11,12 @@
<span class="glyphicon glyphicon-trash"></span>
Remove layer
</a>
<a class="btn btn-default btn-block layer-add-{{data.pk}} layerbtn" data-layer='{ "id": {{data.pk}}, "name": "{{data.layer.name}}", "layerdetailurl": "{%url 'layerdetails' extra.pid data.pk%}"}' data-directive="add"
<a class="btn btn-default btn-block layer-add-{{data.pk}} layerbtn"
data-layer='{ "id": {{data.pk}},
"name": "{{data.layer.name}}",
"xhrLayerUrl": "{% url "xhr_layer" extra.pid data.pk %}",
"layerdetailurl": "{%url "layerdetails" extra.pid data.pk %}"
}' data-directive="add"
{% if data.pk in extra.current_layers %}
style="display:none;"
{% endif %}
@ -14,4 +24,3 @@
<span class="glyphicon glyphicon-plus"></span>
Add layer
</a>

1
bitbake/lib/toaster/toastergui/templates/layerdetails.html
View File

@ -71,6 +71,7 @@
inCurrentPrj : false,
{% endif %}
layerdetailurl : "{% url 'layerdetails' project.id layerversion.id %}",
xhrLayerUrl: "{% url 'xhr_layer' project.id layerversion.id %}",
layer_source: {{layerversion.layer_source|json}},
},
layerSourceTypes: {{layer_source|json}},

7
bitbake/lib/toaster/toastergui/templates/machine_btn.html
View File

@ -4,7 +4,12 @@
{% endif %}
>
Select machine</a>
<a class="btn btn-default btn-block layerbtn layer-add-{{data.layer_version.id}}" data-layer='{ "id": {{data.layer_version.id}}, "name": "{{data.layer_version.layer.name}}", "layerdetailurl": "{%url 'layerdetails' extra.pid data.layer_version.id %}"}' data-directive="add"
<a class="btn btn-default btn-block layerbtn
layer-add-{{data.layer_version.id}}" data-layer='{ "id":
{{data.layer_version.id}}, "name": "{{data.layer_version.layer.name}}",
"layerdetailurl": "{%url 'layerdetails' extra.pid data.layer_version.id %},
"xhrLayerUrl": "{% url "xhr_layer" extra.pid data.pk %}",
}' data-directive="add"
{% if data.layer_version.pk in extra.current_layers %}
style="display:none;"
{% endif %}

8
bitbake/lib/toaster/toastergui/templates/recipe_btn.html
View File

@ -5,7 +5,13 @@
>
Build recipe
</a>
<a class="btn btn-default btn-block layerbtn layer-add-{{data.layer_version.pk}}" data-layer='{ "id": {{data.layer_version.pk}}, "name": "{{data.layer_version.layer.name}}", "layerdetailurl": "{%url 'layerdetails' extra.pid data.layer_version.pk%}"}' data-directive="add"
<a class="btn btn-default btn-block layerbtn layer-add-{{data.layer_version.pk}}"
data-layer='{
"id": {{data.layer_version.pk}},
"name": "{{data.layer_version.layer.name}}",
"layerdetailurl": "{%url "layerdetails" extra.pid data.layer_version.pk%}",
"xhrLayerUrl": "{% url "xhr_layer" extra.pid data.layer_version.pk %}"
}' data-directive="add"
{% if data.layer_version.pk in extra.current_layers %}
style="display:none;"
{% endif %}