[bitbake-devel] [PATCH 2/4] toaster: layerdetails Remove compatibility setting
Alex DAMIAN
alexandru.damian at intel.com
Wed Jan 14 12:46:53 UTC 2015
From: Michael Wood <michael.g.wood at intel.com>
Remove the layer compatibility configuration option from the layer
details as this is not in the design.
Signed-off-by: Michael Wood <michael.g.wood at intel.com>
---
lib/toaster/toastergui/static/js/layerdetails.js | 10 ++--------
lib/toaster/toastergui/templates/layerdetails.html | 21 +--------------------
lib/toaster/toastergui/views.py | 1 -
3 files changed, 3 insertions(+), 29 deletions(-)
diff --git a/lib/toaster/toastergui/static/js/layerdetails.js b/lib/toaster/toastergui/static/js/layerdetails.js
index a5a6330..41cbf4b 100644
--- a/lib/toaster/toastergui/static/js/layerdetails.js
+++ b/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/lib/toaster/toastergui/templates/layerdetails.html b/lib/toaster/toastergui/templates/layerdetails.html
index c69f9e9..5bed0f8 100644
--- a/lib/toaster/toastergui/templates/layerdetails.html
+++ b/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/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py
index 7a9d662..e414b66 100755
--- a/lib/toaster/toastergui/views.py
+++ b/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(),
--
1.9.1
More information about the bitbake-devel
mailing list