Skip to content

Commit 183420d

Browse files
Merge pull request #2730 from spadgett/certificate-update-check
Automatic merge from submit-queue. Allow users to edit route TLS if they can create custom hosts Console change for openshift/origin#18312 Closes #2699 /assign @jwforres /hold because the upstream change hasn't merged
2 parents ea1ff40 + 89077fc commit 183420d

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

app/scripts/directives/oscRouting.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,10 @@ angular.module("openshiftConsole")
7575

7676
// Certificate updates also require custom host.
7777
scope.areCertificateInputsReadOnly = function() {
78-
return !canISetCustomHost();
78+
// For both new and existing routes, you can update TLS if you can
79+
// *create* custom hosts.
80+
// See https://github.com/openshift/origin/pull/18312
81+
return !scope.canICreateCustomHosts;
7982
};
8083

8184
scope.areCertificateInputsDisabled = function() {

dist/scripts/scripts.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10047,7 +10047,7 @@ return r.existingRoute ? r.canIUpdateCustomHosts : r.canICreateCustomHosts;
1004710047
r.isHostnameReadOnly = function() {
1004810048
return !c();
1004910049
}, r.disableWildcards = t.DISABLE_WILDCARD_ROUTES, r.areCertificateInputsReadOnly = function() {
10050-
return !c();
10050+
return !r.canICreateCustomHosts;
1005110051
}, r.areCertificateInputsDisabled = function() {
1005210052
var e = _.get(r, "route.tls.termination");
1005310053
return !e || "passthrough" === e;

0 commit comments

Comments
 (0)