diff options
| -rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/layerdetails.js | 10 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/layerdetails.html | 21 | ||||
| -rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 1 |
3 files changed, 3 insertions, 29 deletions
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) { | |||
| 309 | var entryElement = mParent.find("input"); | 309 | var entryElement = mParent.find("input"); |
| 310 | if (entryElement.length == 0) | 310 | if (entryElement.length == 0) |
| 311 | entryElement = mParent.find("textarea"); | 311 | entryElement = mParent.find("textarea"); |
| 312 | if (entryElement.length == 0) | ||
| 313 | entryElement = mParent.find("select"); | ||
| 314 | if (entryElement.length == 0) { | 312 | if (entryElement.length == 0) { |
| 315 | console.warn("Could not find element to get data from for this change"); | 313 | console.warn("Could not find element to get data from for this change"); |
| 316 | return; | 314 | return; |
| @@ -331,12 +329,8 @@ function layerDetailsPageInit (ctx) { | |||
| 331 | /* success layer property changed */ | 329 | /* success layer property changed */ |
| 332 | var inputArea = mParent.parents("dd"); | 330 | var inputArea = mParent.parents("dd"); |
| 333 | var text; | 331 | var text; |
| 334 | /* We don't actually want the value from the select option we want | 332 | |
| 335 | * the text that represents the value to display | 333 | text = entryElement.val(); |
| 336 | */ | ||
| 337 | text = entryElement.children("option:selected").text(); | ||
| 338 | if (!text) | ||
| 339 | text = entryElement.val(); | ||
| 340 | 334 | ||
| 341 | /* Hide the "Not set" text if it's visible */ | 335 | /* Hide the "Not set" text if it's visible */ |
| 342 | inputArea.find(".muted").hide(); | 336 | 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 @@ | |||
| 160 | </form> | 160 | </form> |
| 161 | <i class="icon-pencil"></i> | 161 | <i class="icon-pencil"></i> |
| 162 | </dd> | 162 | </dd> |
| 163 | <dt> | 163 | <dt> |
| 164 | <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> | ||
| 165 | Yocto Project compatibility | ||
| 166 | </dt> | ||
| 167 | <dd> | ||
| 168 | <span class="current-value">{{layerversion.up_branch.name}}</span> | ||
| 169 | <form style="display:none"> | ||
| 170 | <div class="input-append"> | ||
| 171 | <select name="projectversion" id="projectversion"> | ||
| 172 | {% for compat in yocto_compat %} | ||
| 173 | <option value="{{compat.id}}" {%if layerversion.up_branch.id == compat.id %} selected{%endif%}>{{compat.name}}</option> | ||
| 174 | {% endfor %} | ||
| 175 | </select> | ||
| 176 | <button data-layer-prop="up_branch" class="btn change-btn" type="button">Save</button> | ||
| 177 | <a href="#" style="display:none" class="btn btn-link cancel">Cancel</a> | ||
| 178 | </div> | ||
| 179 | </form> | ||
| 180 | <i class="icon-pencil"></i> | ||
| 181 | </dd> | ||
| 182 | <dt> | ||
| 183 | <i class="icon-question-sign get-help" title="Other layers this layer depends upon"></i> | 164 | <i class="icon-question-sign get-help" title="Other layers this layer depends upon"></i> |
| 184 | Layer dependencies | 165 | Layer dependencies |
| 185 | </dt> | 166 | </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: | |||
| 2524 | context = { | 2524 | context = { |
| 2525 | 'layerversion': layer_version, | 2525 | 'layerversion': layer_version, |
| 2526 | 'layer_in_project' : ProjectLayer.objects.filter(project_id=request.session['project_id'],layercommit=layerid).count(), | 2526 | 'layer_in_project' : ProjectLayer.objects.filter(project_id=request.session['project_id'],layercommit=layerid).count(), |
| 2527 | 'yocto_compat': Branch.objects.filter(layer_source=layer_version.layer_source), | ||
| 2528 | 'machines': machines, | 2527 | 'machines': machines, |
| 2529 | 'targets': targets, | 2528 | 'targets': targets, |
| 2530 | 'total_targets': Recipe.objects.filter(layer_version=layer_version).count(), | 2529 | 'total_targets': Recipe.objects.filter(layer_version=layer_version).count(), |
