Skip to content

Commit 8527558

Browse files
committed
Bug 1333172 - differ between route hostname and navigation within the console
1 parent d3f5e45 commit 8527558

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

app/scripts/filters/resources.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,11 @@ angular.module('openshiftConsole')
314314
return url;
315315
};
316316
})
317-
.filter('routeLabel', function(routeHostFilter) {
317+
.filter('routeLabel', function(routeHostFilter, routeWebURLFilter, isWebRouteFilter) {
318318
return function(route, host) {
319+
if (isWebRouteFilter(route)) {
320+
return routeWebURLFilter(route, host);
321+
}
319322
var label = (host || routeHostFilter(route));
320323
if (route.spec.path) {
321324
label += route.spec.path;

dist/scripts/scripts.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7501,10 +7501,11 @@ return function(b, c) {
75017501
var d = b.spec.tls && "" !== b.spec.tls.tlsTerminationType ? "https" :"http", e = d + "://" + (c || a(b));
75027502
return b.spec.path && (e += b.spec.path), e;
75037503
};
7504-
} ]).filter("routeLabel", [ "routeHostFilter", function(a) {
7505-
return function(b, c) {
7506-
var d = c || a(b);
7507-
return b.spec.path && (d += b.spec.path), d || "<unknown host>";
7504+
} ]).filter("routeLabel", [ "routeHostFilter", "routeWebURLFilter", "isWebRouteFilter", function(a, b, c) {
7505+
return function(d, e) {
7506+
if (c(d)) return b(d, e);
7507+
var f = e || a(d);
7508+
return d.spec.path && (f += d.spec.path), f || "<unknown host>";
75087509
};
75097510
} ]).filter("parameterPlaceholder", function() {
75107511
return function(a) {

0 commit comments

Comments
 (0)