Commit 1870d516 authored by Aleksey Shirokih's avatar Aleksey Shirokih

Merge branch 'fix_combo' into 'master'

Fix combo bug, combo controls become selects

See merge request !22
parents 2f85ed4f aef02605
Pipeline #10763 failed with stages
in 26 seconds
......@@ -3,6 +3,7 @@
* Add TOWER_SSH_KEY_PATH var. Should be used to specify ssh key in case of ed25519 and other types.
* Ansible version bumped to 2.7
* Fix combo controls bug in node create/edit page, combo controls become selects
* Fix node name == service name bug
## 0.4.4 (2018-08-25)
......
......@@ -73,6 +73,8 @@ var node_logic = {
on_edit: function () {
var data = $$("node_list").getSelectedItem();
data.datacenter = data.datacenter.id;
data.node_type = data.node_type.id;
$$("node_form").setValues(data);
node_logic.show_form();
},
......
......@@ -127,7 +127,7 @@ var node_form = {
required: true,
},
{
view: "combo",
view: "select",
name: "datacenter",
label: "Datacenter",
options: "rpc->datacenter:lookup",
......@@ -145,7 +145,7 @@ var node_form = {
body: {
cols: [
{
view: "combo",
view: "select",
name: "node_type",
label: "Node Type",
options: "rpc->nodetype:lookup",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment