From 8d96256c39f2c31209ec1f8fe06b96d3b59b403c Mon Sep 17 00:00:00 2001
From: Michael Wood <michael.g.wood@intel.com>
Date: Mon, 8 Dec 2014 15:26:27 +0000
Subject: 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>
---
 bitbake/lib/toaster/toastergui/static/js/importlayer.js   | 2 +-
 bitbake/lib/toaster/toastergui/templates/importlayer.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'bitbake')

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) {
 
   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/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 @@
                       </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>
-- 
cgit v1.2.3-54-g00ecf