mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-03-13 06:19:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.4-wip' of github.com:limetech/webgui into 6.4-wip

Browse Source
This commit is contained in:
Tom Mortensen
2017-05-16 12:50:03 -07:00
parent 5f6eee021d c36449e0cc
commit 472ebc9b5f
4 changed files with 180 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/dynamix.docker.manager/include/DockerClient.php
View File

@@ -322,12 +322,10 @@ class DockerTemplates {
if (!$tmp['icon'] || $reload) {
$icon = $this->getIcon($image);
$tmp['icon'] = ($icon) ? $icon : null;
}
if (!$tmp['url'] || $reload) {
$WebUI = $this->getControlURL($name);
$tmp['url'] = ($WebUI) ? $WebUI : null;
$tmp['icon'] = $icon ?: null;
}
$WebUI = $this->getControlURL($name);
$tmp['url'] = $WebUI ?: null;
$Registry = $this->getTemplateValue($image, "Registry");
$tmp['registry'] = ($Registry) ? $Registry : null;