Commit aef02605 authored by Aleksey Shirokih's avatar Aleksey Shirokih

Merge branch 'master' into 'fix_combo'

# Conflicts:
#   CHANGELOG.md
parents 2486bb74 2f85ed4f
......@@ -4,6 +4,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)
### Release Notes
......
......@@ -28,7 +28,7 @@ easy_install pip
<pre><code>
apt update
apt install --no-install-recommends python-pip curl
apt install --no-install-recommends python-pip curl python-setuptools
</code></pre>
</details>
......@@ -42,6 +42,7 @@ systemctl enable docker
#### Install docker compose
```
pip install docker-compose
# If u have an error about setuptools: pip install --upgrade setuptools
mkdir /etc/docker-compose/tower -p
```
......
......@@ -75,7 +75,7 @@ var service_logic = {
common.icon(obj, common) +
common.folder(obj, common) +
"<span>" + obj[name] + "</span>"
} else if (parent !== obj[name]) {
} else if ( obj[name] !== undefined && ( (parent !== obj[name]) || (name == 'service') ) ) {
return obj[name];
} else {
return ""
......
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