diff options
| author |   Michael Wood <michael.g.wood@intel.com> | 2014-12-08 15:26:27 +0000 |
|---|---|---|
| committer |   Alexandru DAMIAN <alexandru.damian@intel.com> | 2014-12-12 11:40:47 +0000 |
| commit | 54165dd929ef304357806411cd70caf85b6132f0 (patch) | |
| tree | 194ac57219cade7f46d25cdbfb1d3e8ccc2785b0 | |
| parent | 23ca89dc3e0f0ea387649f1e9e8d7d50846048d6 (diff) | |
| download | bitbake-54165dd929ef304357806411cd70caf85b6132f0.tar.gz | |
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.
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
| -rw-r--r-- | lib/toaster/toastergui/static/js/importlayer.js | 2 | ||||
| -rw-r--r-- | lib/toaster/toastergui/templates/importlayer.html | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/toaster/toastergui/static/js/importlayer.js b/lib/toaster/toastergui/static/js/importlayer.js index 15830dded..34dbcd9ed 100644 --- a/lib/toaster/toastergui/static/js/importlayer.js +++ b/lib/toaster/toastergui/static/js/importlayer.js @@ -4,7 +4,7 @@ function importLayerPageInit (ctx) { var layerDepBtn = $("#add-layer-dependency-btn"); var importAndAddBtn = $("#import-and-add-btn"); - var layerNameInput = $("#layer-name"); + var layerNameInput = $("#import-layer-name"); var vcsURLInput = $("#layer-git-repo-url"); var gitRefInput = $("#layer-git-ref"); var layerDepInput = $("#layer-dependency"); diff --git a/lib/toaster/toastergui/templates/importlayer.html b/lib/toaster/toastergui/templates/importlayer.html index 00fd694c1..c59247f8a 100644 --- a/lib/toaster/toastergui/templates/importlayer.html +++ b/lib/toaster/toastergui/templates/importlayer.html @@ -48,12 +48,12 @@ </div> <div class="control-group" id="layer-name-ctrl"> - <label class="control-label" for="layer-name"> + <label class="control-label" for="import-layer-name"> Layer name <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" /> </label> <div class="controls"> - <input id="layer-name" type="text" required autofocus> + <input id="import-layer-name" type="text" required autofocus> <span class="help-inline" style="display: none;" id="invalid-layer-name-hint">A valid layer name can only include letters, numbers and dashes</span> <span class="help-inline" style="display: none;" id="duplicated-layer-name-hint"></span> </div> |