Commit e1ef364d authored by Aleksey Shirokih's avatar Aleksey Shirokih

Merge branch 'master' into 'fix_service_eq_node'

# Conflicts:
#   tower/ui/service_logic.js
parents cddb3e88 1870d516
......@@ -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]) || (name == 'service') ) && obj[name] !== undefined ) {
} 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