Skip to content

Commit 8ecb3f5

Browse files
author
OpenShift Bot
committed
bump(github.com/openshift/origin-web-console): c971f7568a31038543a4ec3f26188ca563e6e714
1 parent 9bc4696 commit 8ecb3f5

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

pkg/assets/bindata.go

+9-5
Original file line numberDiff line numberDiff line change
@@ -8676,7 +8676,7 @@ return {
86768676
name:b,
86778677
value:a
86788678
};
8679-
}), a.systemLabels.push({
8679+
}), L() && a.systemLabels.push({
86808680
name:"app",
86818681
value:a.template.metadata.name
86828682
});
@@ -8742,7 +8742,7 @@ type:"error"
87428742
});
87438743
d.length ? (a.disableInputs = !1, a.alerts = c) :c.length ? (J(c), a.disableInputs = !1) :I();
87448744
};
8745-
if (a.createFromTemplate = function() {
8745+
a.createFromTemplate = function() {
87468746
a.disableInputs = !0;
87478747
var b = s.mapEntries(s.compactEntries(a.labels)), c = s.mapEntries(s.compactEntries(a.systemLabels));
87488748
a.template.labels = _.extend(c, b), d.create("processedtemplates", null, a.template, f).then(function(b) {
@@ -8756,19 +8756,23 @@ message:"An error occurred processing the template.",
87568756
details:c
87578757
};
87588758
});
8759-
}, v) d.get("templates", u, {
8759+
};
8760+
var L = function() {
8761+
return !_.get(a.template, "labels.app") && !_.some(a.template.objects, "metadata.labels.app");
8762+
};
8763+
if (v) d.get("templates", u, {
87608764
namespace:v || a.projectName
87618765
}).then(function(b) {
87628766
a.template = b, E(), a.breadcrumbs[3].title = n("displayName")(b);
87638767
}, function() {
87648768
m.toErrorPage("Cannot create from template: the specified template could not be retrieved.");
87658769
}); else {
87668770
if (a.template = r.getTemplate(), _.isEmpty(a.template)) {
8767-
var L = URI("error").query({
8771+
var M = URI("error").query({
87688772
error:"not_found",
87698773
error_description:"Template wasn't found in cache."
87708774
}).toString();
8771-
j.url(L);
8775+
j.url(M);
87728776
}
87738777
r.clearTemplate(), E();
87748778
}

0 commit comments

Comments
 (0)