[bitbake-devel] [PATCH 14/18] toaster: importlayer Avoid namespace clash with layer name

Alex DAMIAN alexandru.damian at intel.com
Fri Dec 12 11:45:13 UTC 2014


From: Michael Wood <michael.g.wood at intel.com>

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 at intel.com>
---
 lib/toaster/toastergui/static/js/importlayer.js   | 2 +-
 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 15830dd..34dbcd9 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 00fd694..c59247f 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>
-- 
1.9.1




More information about the bitbake-devel mailing list