MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 12:49:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

comparisonrecipeselect: fix logic for setting modal title

Browse Source 
If you clicked on "Select" then cancelled the modal that appears, then
clicked on "No match" then the title of the modal in the second instance
retains the recipe name from the first time which is wrong. Rearrange
the logic so that this cannot happen (and make it tidier at the same
time).

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2018-09-26 16:05:46 +12:00
parent 606e14e412
commit f039aaa4f4
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
templates/layerindex/comparisonrecipeselect.html
View File

@ -30,7 +30,7 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h3 id="selectRecipeDialogLabel">Select <span id="id_span_select_recipe">recipe</span> to match {{ select_for.pn }}</h3>
<h3 id="selectRecipeDialogLabel">Dialog title</h3>
</div>
<div class="modal-body">
{% csrf_token %}
@ -95,19 +95,13 @@
// FIXME this does tend to cause items to re-sort
$('#id_selectrecipedialog-cover_status').append($('#id_hidden_selectbox').children());
if( !pn ) {
$('#id_hidden_selectbox').append($('#id_selectrecipedialog-cover_status option[value="D"]'));
$('#id_hidden_selectbox').append($('#id_selectrecipedialog-cover_status option[value="E"]'));
}
else {
if( pn ) {
$('#id_hidden_selectbox').append($('#id_selectrecipedialog-cover_status option[value="N"]'));
$('#id_hidden_selectbox').append($('#id_selectrecipedialog-cover_status option[value="S"]'));
$('#id_hidden_selectbox').append($('#id_selectrecipedialog-cover_status option[value="U"]'));
}
$('#id_span_select_recipe').text(pn);
$('#id_selectrecipedialog-cover_pn').val(pn);
$('#id_selectrecipedialog-cover_layerbranch').val($(this).attr('recipe-layerbranch'));
if( pn ) {
$('#selectRecipeDialogLabel').html('Select ' + pn + ' to match {{ select_for.pn }}');
$('#id_selectrecipedialog-cover_pn').val(pn);
$('#id_selectrecipedialog-cover_layerbranch').val($(this).attr('recipe-layerbranch'));
{% if existing_cover_recipe %}
$('#id_selectrecipedialog-cover_status').val('{{ select_for.cover_status }}');
{% else %}
@ -115,6 +109,9 @@
{% endif %}
}
else {
$('#id_hidden_selectbox').append($('#id_selectrecipedialog-cover_status option[value="D"]'));
$('#id_hidden_selectbox').append($('#id_selectrecipedialog-cover_status option[value="E"]'));
$('#selectRecipeDialogLabel').html('Specify no match for {{ select_for.pn }}');
$('#id_selectrecipedialog-cover_status').val('N');
}
});