From ce784879f48086ba8d33d7589293afbaf94780a0 Mon Sep 17 00:00:00 2001
From: Michael Wood <michael.g.wood@intel.com>
Date: Wed, 14 Jan 2015 12:46:53 +0000
Subject: bitbake: toaster: layerdetails Remove compatibility setting

Remove the layer compatibility configuration option from the layer
details as this is not in the design.

(Bitbake rev: c46492f5599da8af16af05ecc2d7aa7a8660416b)

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../toaster/toastergui/static/js/layerdetails.js    | 10 ++--------
 .../toaster/toastergui/templates/layerdetails.html  | 21 +--------------------
 bitbake/lib/toaster/toastergui/views.py             |  1 -
 3 files changed, 3 insertions(+), 29 deletions(-)

(limited to 'bitbake')

diff --git a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js
index a5a6330630..41cbf4ba93 100644
--- a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js
+++ b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js
@@ -309,8 +309,6 @@ function layerDetailsPageInit (ctx) {
     var entryElement = mParent.find("input");
     if (entryElement.length == 0)
       entryElement = mParent.find("textarea");
-    if (entryElement.length == 0)
-      entryElement = mParent.find("select");
     if (entryElement.length == 0) {
       console.warn("Could not find element to get data from for this change");
       return;
@@ -331,12 +329,8 @@ function layerDetailsPageInit (ctx) {
             /* success layer property changed */
             var inputArea = mParent.parents("dd");
             var text;
-            /* We don't actually want the value from the select option we want
-             * the text that represents the value to display
-             */
-            text = entryElement.children("option:selected").text();
-            if (!text)
-              text = entryElement.val();
+
+            text = entryElement.val();
 
             /* Hide the "Not set" text if it's visible */
             inputArea.find(".muted").hide();
diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html
index c69f9e945a..5bed0f8f06 100644
--- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html
+++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html
@@ -160,26 +160,7 @@
                     </form>
                     <i class="icon-pencil"></i>
                   </dd>
-                  <dt>
-                    <i class="icon-question-sign get-help" title="The Yocto Project versions with which this layer is compatible. Currently Toaster supports Yocto Project 1.6 and 1.7"></i>
-                    Yocto Project compatibility
-                  </dt>
-                  <dd>
-                    <span class="current-value">{{layerversion.up_branch.name}}</span>
-                    <form style="display:none">
-                      <div class="input-append">
-                        <select name="projectversion" id="projectversion">
-                          {% for compat in yocto_compat %}
-                          <option value="{{compat.id}}" {%if layerversion.up_branch.id == compat.id %} selected{%endif%}>{{compat.name}}</option>
-                          {% endfor %}
-                        </select>
-                        <button  data-layer-prop="up_branch" class="btn change-btn" type="button">Save</button>
-                        <a href="#" style="display:none" class="btn btn-link cancel">Cancel</a>
-                      </div>
-                    </form>
-                    <i class="icon-pencil"></i>
-                  </dd>
-                  <dt>
+                 <dt>
                     <i class="icon-question-sign get-help" title="Other layers this layer depends upon"></i>
                     Layer dependencies
                   </dt>
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 7a9d662b31..e414b66480 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -2524,7 +2524,6 @@ if toastermain.settings.MANAGED:
         context = {
             'layerversion': layer_version,
             'layer_in_project' : ProjectLayer.objects.filter(project_id=request.session['project_id'],layercommit=layerid).count(),
-            'yocto_compat': Branch.objects.filter(layer_source=layer_version.layer_source),
             'machines': machines,
             'targets': targets,
             'total_targets': Recipe.objects.filter(layer_version=layer_version).count(),
-- 
cgit v1.2.3-54-g00ecf