From 07984a2a9ab5c7bbf62f4c56f81dc6249d255a6b Mon Sep 17 00:00:00 2001 From: catborise <catborise@yahoo.com> Date: Thu, 25 Oct 2018 09:57:41 +0300 Subject: [PATCH] attach volume dropdown menu rearranged to show selected pool --- instances/templates/add_instance_volume.html | 4 ++-- instances/templates/instance.html | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/instances/templates/add_instance_volume.html b/instances/templates/add_instance_volume.html index 3c94225..8d0ac97 100644 --- a/instances/templates/add_instance_volume.html +++ b/instances/templates/add_instance_volume.html @@ -103,14 +103,14 @@ <label class="col-sm-3 control-label" style="font-weight:normal;">{% trans "Storage" %}</label> <div class="col-sm-4"> <div class="dropdown"> - <button class="btn dropdown-toggle" type="button" data-toggle="dropdown">{% trans 'Select Pool...' %} + <button id="select_storage" class="btn dropdown-toggle" type="button" data-toggle="dropdown">{% trans 'Select Pool...' %} <span class="caret"></span></button> <ul class="dropdown-menu"> {% for storage in storages %} <li><a href="#" onclick="get_volumes({{ compute_id }}, '{{ storage }}')">{{ storage }}</a></li> {% endfor %} </ul> - <input id="selected_storage" name="selected_storage" type="hidden" value=""/> + <input id="selected_storage" name="selected_storage" hidden/> </div> </div> </div> diff --git a/instances/templates/instance.html b/instances/templates/instance.html index 5303c37..dba2547 100644 --- a/instances/templates/instance.html +++ b/instances/templates/instance.html @@ -1253,8 +1253,13 @@ select.removeChild(select.options[0]); } - var input_sto = document.getElementById('selected_storage'); - input_sto.value = pool; + var sto_drop = document.getElementById('select_storage'); + sto_drop.value = pool; + sto_drop.innerHTML = pool + "<span class=\"caret\"></span>"; + + var sto_input = document.getElementById('selected_storage'); + sto_input.value = pool; + sto_input.innerHTML = pool; $.getJSON(vol_url, function(data) { if (data.length > 0) {