diff --git a/app/scripts/services/navigate.js b/app/scripts/services/navigate.js index 89375ffb81..991716eb92 100644 --- a/app/scripts/services/navigate.js +++ b/app/scripts/services/navigate.js @@ -179,6 +179,12 @@ angular.module("openshiftConsole") url.segment("images") .segmentCoded(name); break; + case "ImageStreamTag": + var ind = name.indexOf(':'); + url.segment("images") + .segmentCoded(name.substring(0, ind)) + .segmentCoded(name.substring(ind + 1)); + break; case "PersistentVolumeClaim": case "Pod": case "Route": diff --git a/app/views/browse/_build-details.html b/app/views/browse/_build-details.html index e0958ebc8c..4e9ecce478 100644 --- a/app/views/browse/_build-details.html +++ b/app/views/browse/_build-details.html @@ -72,8 +72,16 @@

Configuration created from {{build.spec.source.git.ref}}
Source Context Dir:
{{build.spec.source.contextDir}}
-
Output Image:
-
{{build.spec.output.to | imageObjectRef : build.metadata.namespace}}
+
Output Image:
+
+ + {{outputTo | imageObjectRef : build.metadata.namespace}} + + + {{outputTo | imageObjectRef : build.metadata.namespace}} + +
Push Secret:
{{build.spec.output.pushSecret.name}}
diff --git a/app/views/browse/build-config.html b/app/views/browse/build-config.html index 3dbdd5e130..61baf7b9bd 100644 --- a/app/views/browse/build-config.html +++ b/app/views/browse/build-config.html @@ -267,11 +267,27 @@

{{imageSource.from | imageObjectRef : buildConfig.metadata.namespace}}

-
Builder Image:
-
{{(buildConfig | buildStrategy).from | imageObjectRef : buildConfig.metadata.namespace}}
-
+
Builder Image:
+
+ + {{buildFrom | imageObjectRef : buildConfig.metadata.namespace}} + + + {{buildFrom | imageObjectRef : buildConfig.metadata.namespace}} + +
+
Output To:
-
{{buildConfig.spec.output.to | imageObjectRef : buildConfig.metadata.namespace}}
+
+ + {{outputTo | imageObjectRef : buildConfig.metadata.namespace}} + + + {{outputTo | imageObjectRef : buildConfig.metadata.namespace}} + +
Run Policy:
@@ -333,8 +349,14 @@

Triggers

New Image For:
-
- {{(trigger.imageChange.from || (buildConfig | buildStrategy).from) | imageObjectRef : buildConfig.metadata.namespace}} +
+ + {{triggerFrom | imageObjectRef : buildConfig.metadata.namespace}} + + + {{triggerFrom | imageObjectRef : buildConfig.metadata.namespace}} +
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js index 17fcaefd6b..8cb98ed123 100644 --- a/dist/scripts/scripts.js +++ b/dist/scripts/scripts.js @@ -2174,6 +2174,11 @@ case "ImageStream": i.segment("images").segmentCoded(h); break; +case "ImageStreamTag": +var m = h.indexOf(":"); +i.segment("images").segmentCoded(h.substring(0, m)).segmentCoded(h.substring(m + 1)); +break; + case "PersistentVolumeClaim": case "Pod": case "Route": @@ -2183,16 +2188,16 @@ i.segment(g.kindToResource(b)).segmentCoded(h); break; default: -var m; -if (a.metadata) m = g.objectToResourceGroupVersion(a); else if (_.get(e, "apiVersion")) { -var n = g.kindToResource(b), o = g.parseGroupVersion(e.apiVersion); -o.resource = n, m = g.toResourceGroupVersion(o); -} else m = g.toResourceGroupVersion(g.kindToResource(b)); -var p = g.apiInfo(m); -if (!p) return null; +var n; +if (a.metadata) n = g.objectToResourceGroupVersion(a); else if (_.get(e, "apiVersion")) { +var o = g.kindToResource(b), p = g.parseGroupVersion(e.apiVersion); +p.resource = o, n = g.toResourceGroupVersion(p); +} else n = g.toResourceGroupVersion(g.kindToResource(b)); +var q = g.apiInfo(n); +if (!q) return null; i.segment("other").search({ kind:b, -group:m.group +group:n.group }); } return i.toString(); diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js index 706af81d57..1d3032a364 100644 --- a/dist/scripts/templates.js +++ b/dist/scripts/templates.js @@ -1278,8 +1278,15 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function( "
{{build.spec.source.git.ref}}
\n" + "
Source Context Dir:
\n" + "
{{build.spec.source.contextDir}}
\n" + - "
Output Image:
\n" + - "
{{build.spec.output.to | imageObjectRef : build.metadata.namespace}}
\n" + + "
Output Image:
\n" + + "
\n" + + "\n" + + "{{outputTo | imageObjectRef : build.metadata.namespace}}\n" + + "\n" + + "\n" + + "{{outputTo | imageObjectRef : build.metadata.namespace}}\n" + + "\n" + + "
\n" + "
Push Secret:
\n" + "
{{build.spec.output.pushSecret.name}}
\n" + "
\n" + @@ -1897,11 +1904,25 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function( "
\n" + "
\n" + "\n" + - "
Builder Image:
\n" + - "
{{(buildConfig | buildStrategy).from | imageObjectRef : buildConfig.metadata.namespace}}
\n" + - "
\n" + + "
Builder Image:
\n" + + "
\n" + + "\n" + + "{{buildFrom | imageObjectRef : buildConfig.metadata.namespace}}\n" + + "\n" + + "\n" + + "{{buildFrom | imageObjectRef : buildConfig.metadata.namespace}}\n" + + "\n" + + "
\n" + + "
\n" + "
Output To:
\n" + - "
{{buildConfig.spec.output.to | imageObjectRef : buildConfig.metadata.namespace}}
\n" + + "
\n" + + "\n" + + "{{outputTo | imageObjectRef : buildConfig.metadata.namespace}}\n" + + "\n" + + "\n" + + "{{outputTo | imageObjectRef : buildConfig.metadata.namespace}}\n" + + "\n" + + "
\n" + "
\n" + "
\n" + "
Run Policy:
\n" + @@ -1963,8 +1984,13 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function( "
\n" + "New Image For:\n" + "
\n" + - "
\n" + - "{{(trigger.imageChange.from || (buildConfig | buildStrategy).from) | imageObjectRef : buildConfig.metadata.namespace}}\n" + + "
\n" + + "\n" + + "{{triggerFrom | imageObjectRef : buildConfig.metadata.namespace}}\n" + + "\n" + + "\n" + + "{{triggerFrom | imageObjectRef : buildConfig.metadata.namespace}}\n" + + "\n" + "
\n" + "
\n" + "
\n" +