diff options
author | Michael Wood <michael.g.wood@intel.com> | 2014-12-08 15:26:27 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-18 10:24:07 +0000 |
commit | 8d96256c39f2c31209ec1f8fe06b96d3b59b403c (patch) | |
tree | 7d65ed585bcaa32d2863606c0998ab4cfe01f93a /bitbake | |
parent | dadc11a52f7048891f9be0118fa19c96c3061547 (diff) | |
download | poky-8d96256c39f2c31209ec1f8fe06b96d3b59b403c.tar.gz |
bitbake: toaster: importlayer Avoid namespace clash with layer name
This was causing validation issues as the layer name was being picked up
from a different location in the dom.
(Bitbake rev: 54165dd929ef304357806411cd70caf85b6132f0)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/importlayer.js | 2 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/importlayer.html | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/importlayer.js b/bitbake/lib/toaster/toastergui/static/js/importlayer.js index 15830dded5..34dbcd9ed7 100644 --- a/bitbake/lib/toaster/toastergui/static/js/importlayer.js +++ b/bitbake/lib/toaster/toastergui/static/js/importlayer.js | |||
@@ -4,7 +4,7 @@ function importLayerPageInit (ctx) { | |||
4 | 4 | ||
5 | var layerDepBtn = $("#add-layer-dependency-btn"); | 5 | var layerDepBtn = $("#add-layer-dependency-btn"); |
6 | var importAndAddBtn = $("#import-and-add-btn"); | 6 | var importAndAddBtn = $("#import-and-add-btn"); |
7 | var layerNameInput = $("#layer-name"); | 7 | var layerNameInput = $("#import-layer-name"); |
8 | var vcsURLInput = $("#layer-git-repo-url"); | 8 | var vcsURLInput = $("#layer-git-repo-url"); |
9 | var gitRefInput = $("#layer-git-ref"); | 9 | var gitRefInput = $("#layer-git-ref"); |
10 | var layerDepInput = $("#layer-dependency"); | 10 | var layerDepInput = $("#layer-dependency"); |
diff --git a/bitbake/lib/toaster/toastergui/templates/importlayer.html b/bitbake/lib/toaster/toastergui/templates/importlayer.html index 00fd694c12..c59247f8a3 100644 --- a/bitbake/lib/toaster/toastergui/templates/importlayer.html +++ b/bitbake/lib/toaster/toastergui/templates/importlayer.html | |||
@@ -48,12 +48,12 @@ | |||
48 | </div> | 48 | </div> |
49 | 49 | ||
50 | <div class="control-group" id="layer-name-ctrl"> | 50 | <div class="control-group" id="layer-name-ctrl"> |
51 | <label class="control-label" for="layer-name"> | 51 | <label class="control-label" for="import-layer-name"> |
52 | Layer name | 52 | Layer name |
53 | <span class="icon-question-sign get-help" title="Something like 'meta-mylayer'. Your layer name must be unique and can only include letters, numbers and dashes" /> | 53 | <span class="icon-question-sign get-help" title="Something like 'meta-mylayer'. Your layer name must be unique and can only include letters, numbers and dashes" /> |
54 | </label> | 54 | </label> |
55 | <div class="controls"> | 55 | <div class="controls"> |
56 | <input id="layer-name" type="text" required autofocus> | 56 | <input id="import-layer-name" type="text" required autofocus> |
57 | <span class="help-inline" style="display: none;" id="invalid-layer-name-hint">A valid layer name can only include letters, numbers and dashes</span> | 57 | <span class="help-inline" style="display: none;" id="invalid-layer-name-hint">A valid layer name can only include letters, numbers and dashes</span> |
58 | <span class="help-inline" style="display: none;" id="duplicated-layer-name-hint"></span> | 58 | <span class="help-inline" style="display: none;" id="duplicated-layer-name-hint"></span> |
59 | </div> | 59 | </div> |