Skip to content

Commit 1180f16

Browse files
author
OpenShift Bot
committedDec 21, 2016
bump(github.com/openshift/origin-web-console): 4e95180904ce953eb73793a40476af51217ea01f
1 parent 81cccfb commit 1180f16

File tree

1 file changed

+27
-25
lines changed

1 file changed

+27
-25
lines changed
 

Diff for: ‎pkg/assets/bindata.go

+27-25
Original file line numberDiff line numberDiff line change
@@ -8441,49 +8441,51 @@ return void Logger.error("Unknown deployment strategy type: " + a);
84418441
}
84428442
};
84438443
k.get(d.project).then(_.spread(function(c, e) {
8444-
return a.project = c, a.context = e, g.canI("deploymentconfigs", "update", d.project) ? void i.get("deploymentconfigs", d.deploymentconfig, e).then(function(b) {
8445-
a.deploymentConfig = b, a.breadcrumbs = h.getBreadcrumbs({
8446-
object:b,
8444+
return a.project = c, a.context = e, g.canI("deploymentconfigs", "update", d.project) ? void i.get("deploymentconfigs", d.deploymentconfig, e).then(function(f) {
8445+
a.deploymentConfig = f, a.breadcrumbs = h.getBreadcrumbs({
8446+
object:f,
84478447
project:c,
84488448
subpage:"Edit",
84498449
includeProject:!0
84508450
});
8451-
var f = function(b, c) {
8452-
var d = {}, e = _.filter(c, {
8451+
var g = function(c, d) {
8452+
var e = {}, f = _.filter(d, {
84538453
type:"ImageChange"
84548454
});
8455-
return _.each(b, function(b) {
8456-
var c = _.find(e, function(a) {
8457-
return _.includes(a.imageChangeParams.containerNames, b.name);
8458-
}), f = {};
8459-
if (d[b.name] = {
8460-
env:b.env || [],
8461-
image:b.image,
8462-
hasDeploymentTrigger:!_.isEmpty(c)
8463-
}, c) {
8464-
var g = c.imageChangeParams.from, h = g.name.split(":");
8465-
f = {
8466-
data:c,
8455+
return _.each(c, function(c) {
8456+
var d = _.find(f, function(a) {
8457+
return _.includes(a.imageChangeParams.containerNames, c.name);
8458+
}), g = {};
8459+
if (c.env = c.env || [], _.each(c.env, function(a) {
8460+
b("altTextForValueFrom")(a);
8461+
}), e[c.name] = {
8462+
env:c.env,
8463+
image:c.image,
8464+
hasDeploymentTrigger:!_.isEmpty(d)
8465+
}, d) {
8466+
var h = d.imageChangeParams.from, i = h.name.split(":");
8467+
g = {
8468+
data:d,
84678469
istag:{
8468-
namespace:g.namespace || a.projectName,
8469-
imageStream:h[0],
8470+
namespace:h.namespace || a.projectName,
8471+
imageStream:i[0],
84708472
tagObject:{
8471-
tag:h[1]
8473+
tag:i[1]
84728474
}
84738475
},
8474-
automatic:_.get(c, "imageChangeParams.automatic", !1)
8476+
automatic:_.get(d, "imageChangeParams.automatic", !1)
84758477
};
8476-
} else f = {
8478+
} else g = {
84778479
istag:{
84788480
namespace:"",
84798481
imageStream:""
84808482
},
84818483
automatic:!0
84828484
};
8483-
_.set(d, [ b.name, "triggerData" ], f);
8484-
}), d;
8485+
_.set(e, [ c.name, "triggerData" ], g);
8486+
}), e;
84858487
};
8486-
a.updatedDeploymentConfig = angular.copy(a.deploymentConfig), a.containerNames = _.map(a.deploymentConfig.spec.template.spec.containers, "name"), a.containerConfigByName = f(a.updatedDeploymentConfig.spec.template.spec.containers, a.updatedDeploymentConfig.spec.triggers), a.secrets = {
8488+
a.updatedDeploymentConfig = angular.copy(a.deploymentConfig), a.containerNames = _.map(a.deploymentConfig.spec.template.spec.containers, "name"), a.containerConfigByName = g(a.updatedDeploymentConfig.spec.template.spec.containers, a.updatedDeploymentConfig.spec.triggers), a.secrets = {
84878489
pullSecrets:angular.copy(a.deploymentConfig.spec.template.spec.imagePullSecrets) || [ {
84888490
name:""
84898491
} ]

0 commit comments

Comments
 (0)
Please sign in to comment.