From a33123469a20a683befee5414aea2d7cce9602fe Mon Sep 17 00:00:00 2001 From: Erwin Molendijk Date: Mon, 21 Mar 2016 09:25:40 +0100 Subject: [PATCH 1/3] Fixed: Check if variable is plain object before using isEmptyObject() --- app/components/startContainer/startContainerController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/startContainer/startContainerController.js b/app/components/startContainer/startContainerController.js index 354d2d6..bc7527b 100644 --- a/app/components/startContainer/startContainerController.js +++ b/app/components/startContainer/startContainerController.js @@ -40,7 +40,7 @@ angular.module('startContainer', ['ui.bootstrap']) function rmEmptyKeys(col) { for (var key in col) { - if (col[key] === null || col[key] === undefined || col[key] === '' || $.isEmptyObject(col[key]) || col[key].length === 0) { + if (col[key] === null || col[key] === undefined || col[key] === '' || ($.isPlainObject(col[key]) && $.isEmptyObject(col[key])) || col[key].length === 0) { delete col[key]; } } From bfe90386305e3b69af5b8eda8cd1b1a35f5a8685 Mon Sep 17 00:00:00 2001 From: Erwin Molendijk Date: Mon, 21 Mar 2016 10:21:50 +0100 Subject: [PATCH 2/3] Changed: Show automatic port bindings when PublishAllPorts is set. --- app/components/container/container.html | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/components/container/container.html b/app/components/container/container.html index 2ec08ef..0e89f3f 100644 --- a/app/components/container/container.html +++ b/app/components/container/container.html @@ -133,7 +133,17 @@

Publish All: - {{ container.HostConfig.PublishAllPorts }} + +
{{ container.HostConfig.PublishAllPorts }}
+
+
    +
  • + {{ containerport }} => + {{ v.HostIp }}:{{ v.HostPort }} +
  • +
+
+ Ports: From e21af772463e3131459b2ab010582897db5cf2ee Mon Sep 17 00:00:00 2001 From: Erwin Molendijk Date: Mon, 21 Mar 2016 10:36:34 +0100 Subject: [PATCH 3/3] Revert "Changed: Show automatic port bindings when PublishAllPorts is set." This reverts commit bfe90386305e3b69af5b8eda8cd1b1a35f5a8685. --- app/components/container/container.html | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/app/components/container/container.html b/app/components/container/container.html index 0e89f3f..2ec08ef 100644 --- a/app/components/container/container.html +++ b/app/components/container/container.html @@ -133,17 +133,7 @@

Publish All: - -
{{ container.HostConfig.PublishAllPorts }}
-
-
    -
  • - {{ containerport }} => - {{ v.HostIp }}:{{ v.HostPort }} -
  • -
-
- + {{ container.HostConfig.PublishAllPorts }} Ports: