summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/toaster/toastergui/static/js/layerdetails.js8
-rw-r--r--bitbake/lib/toaster/toastergui/templates/layerdetails.html5
2 files changed, 6 insertions, 7 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js
index 5fd7274894..8165bad5dd 100644
--- a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js
+++ b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js
@@ -423,7 +423,7 @@ function layerDetailsPageInit (ctx) {
423 $(this).hide(); 423 $(this).hide();
424 saveSourceChangesBtn.attr("disabled", "disabled"); 424 saveSourceChangesBtn.attr("disabled", "disabled");
425 425
426 $("#git-repo-info", "#directory-info").hide(); 426 $("#git-repo-info, #directory-info").hide();
427 $("#edit-layer-source-form").fadeIn(); 427 $("#edit-layer-source-form").fadeIn();
428 if ($("#layer-dir-path-in-details").val() == "") { 428 if ($("#layer-dir-path-in-details").val() == "") {
429 //Local dir path is empty... 429 //Local dir path is empty...
@@ -473,9 +473,9 @@ function layerDetailsPageInit (ctx) {
473 }); 473 });
474 474
475 $('#cancel-changes-for-switch').click(function() { 475 $('#cancel-changes-for-switch').click(function() {
476 $("#edit-layer-source-form").add("#layer-git").add("#layer-dir").fadeOut().promise().done(function(){ 476 $("#edit-layer-source-form").hide();
477 editLayerSource.show(); 477 $("#directory-info, #git-repo-info").fadeIn();
478 }); 478 editLayerSource.show();
479 }); 479 });
480 480
481 saveSourceChangesBtn.click(function() { 481 saveSourceChangesBtn.click(function() {
diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html
index 7dd0c47a9e..0594b551aa 100644
--- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html
+++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html
@@ -130,8 +130,8 @@
130 130
131 <!-- layer details pane --> 131 <!-- layer details pane -->
132 <div id="information" class="tab-pane active"> 132 <div id="information" class="tab-pane active">
133 {% if layerversion.layer.local_source_dir %}
134 <h3>Layer source code location</h3> 133 <h3>Layer source code location</h3>
134 {% if layerversion.layer.local_source_dir %}
135 <dl class="dl-horizontal" id="directory-info"> 135 <dl class="dl-horizontal" id="directory-info">
136 <dt> 136 <dt>
137 Path to the layer directory 137 Path to the layer directory
@@ -200,8 +200,7 @@
200 <input type="radio" name="source-location" id="repo" value="repo"> 200 <input type="radio" name="source-location" id="repo" value="repo">
201 In a <strong>Git repository</strong> 201 In a <strong>Git repository</strong>
202 </label> 202 </label>
203 <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\ 203 <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>
204 fetch and checkout your chosen Git revision every time you start a build.</p>
205 </div> 204 </div>
206 <div class="radio" style="margin-top:15px;"> 205 <div class="radio" style="margin-top:15px;">
207 <label> 206 <label>