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

bitbake: toaster: layer details Fix "edit" form interaction 

Make sure the layer information disappears when the edit form shows, and
that the layer details come back when you click the 'cancel' button in
the edit form.

(Bitbake rev: bd08abe7c1f5fc96ee73c20b2c9d10a591a5f69c)

Signed-off-by: Belen Barros Pena <belen.barros.pena@linux.intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Belen Barros Pena 2016-09-05 15:29:26 +01:00 committed by Richard Purdie
parent 23056fcc73
commit b5070f5337
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bitbake/lib/toaster/toastergui/static/js/layerdetails.js
View File

@ -423,7 +423,7 @@ function layerDetailsPageInit (ctx) {
$(this).hide();
saveSourceChangesBtn.attr("disabled", "disabled");
$("#git-repo-info", "#directory-info").hide();
$("#git-repo-info, #directory-info").hide();
$("#edit-layer-source-form").fadeIn();
if ($("#layer-dir-path-in-details").val() == "") {
//Local dir path is empty...
@ -473,9 +473,9 @@ function layerDetailsPageInit (ctx) {
});
$('#cancel-changes-for-switch').click(function() {
$("#edit-layer-source-form").add("#layer-git").add("#layer-dir").fadeOut().promise().done(function(){
editLayerSource.show();
});
$("#edit-layer-source-form").hide();
$("#directory-info, #git-repo-info").fadeIn();
editLayerSource.show();
});
saveSourceChangesBtn.click(function() {

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

@ -130,8 +130,8 @@
<!-- layer details pane -->
<div id="information" class="tab-pane active">
{% if layerversion.layer.local_source_dir %}
<h3>Layer source code location</h3>
{% if layerversion.layer.local_source_dir %}
<dl class="dl-horizontal" id="directory-info">
<dt>
Path to the layer directory
@ -200,8 +200,7 @@
<input type="radio" name="source-location" id="repo" value="repo">
In a <strong>Git repository</strong>
</label>
<p class="help-block" style="margin-left:20px;width:70%;">To build the layer Toaster must be able to access the Git repository, otherwise builds will fail. Toaster will\
fetch and checkout your chosen Git revision every time you start a build.</p>
<p class="help-block" style="margin-left:20px;width:70%;">To build the layer Toaster must be able to access the Git repository, otherwise builds will fail. Toaster will fetch and checkout your chosen Git revision every time you start a build.</p>
</div>
<div class="radio" style="margin-top:15px;">
<label>