Skip to content

Allow users to edit route TLS if they can create custom hosts #2730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 6, 2018
Merged

Allow users to edit route TLS if they can create custom hosts #2730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/scripts/directives/oscRouting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ angular.module("openshiftConsole")

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

scope.areCertificateInputsDisabled = function() {
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10056,7 +10056,7 @@ return r.existingRoute ? r.canIUpdateCustomHosts : r.canICreateCustomHosts;
r.isHostnameReadOnly = function() {
return !c();
}, r.disableWildcards = t.DISABLE_WILDCARD_ROUTES, r.areCertificateInputsReadOnly = function() {
return !c();
return !r.canICreateCustomHosts;
}, r.areCertificateInputsDisabled = function() {
var e = _.get(r, "route.tls.termination");
return !e || "passthrough" === e;
Expand Down