diff options
author | David Reyna <David.Reyna@windriver.com> | 2018-10-03 23:10:51 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-04 23:00:24 +0100 |
commit | fa8ade3695b836fb788c57c0d56b546b47f1603a (patch) | |
tree | 8f98535c7d73496867c2850012fd3d2cc2dc30fe /bitbake/lib/toaster/toastergui/templates | |
parent | f0cf4b0972173d5463a31a2543098cee7d6e11c3 (diff) | |
download | poky-fa8ade3695b836fb788c57c0d56b546b47f1603a.tar.gz |
bitbake: toaster: custom image enable layer add, protect pre-cloned layers
When creating custom image recipes, the layer add for new layers
needs missing xhrLayerUrl data. Also, code is needed to check
and inform user if the newly added layer has not been cloned yet,
and provide helpful error message instead of the current frozen
dialog.
[YOCTO #12887]
(Bitbake rev: b310031972a53d0881a87a627f07bdcf7d9c6b79)
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/customise_btn.html | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/customise_btn.html b/bitbake/lib/toaster/toastergui/templates/customise_btn.html index 38c258ac32..ce462401c7 100644 --- a/bitbake/lib/toaster/toastergui/templates/customise_btn.html +++ b/bitbake/lib/toaster/toastergui/templates/customise_btn.html | |||
@@ -5,7 +5,11 @@ | |||
5 | > | 5 | > |
6 | Customise | 6 | Customise |
7 | </button> | 7 | </button> |
8 | <button class="btn btn-default btn-block layer-add-{{data.layer_version.pk}} layerbtn" 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" | 8 | <button class="btn btn-default btn-block layer-add-{{data.layer_version.pk}} layerbtn" |
9 | data-layer='{ "id": {{data.layer_version.pk}}, "name": "{{data.layer_version.layer.name}}", | ||
10 | "layerdetailurl": "{%url 'layerdetails' extra.pid data.layer_version.pk%}", | ||
11 | "xhrLayerUrl": "{% url "xhr_layer" extra.pid data.layer_version.pk %}"}' | ||
12 | data-directive="add" | ||
9 | {% if data.layer_version.pk in extra.current_layers %} | 13 | {% if data.layer_version.pk in extra.current_layers %} |
10 | style="display:none;" | 14 | style="display:none;" |
11 | {% endif %} | 15 | {% endif %} |