Merge pull request #2313 from spadgett/undefined-undefined

Merged by openshift-bot

Author: OpenShift Bot

Diff for: assets/app/scripts/controllers/newfromtemplate.js

@@ -110,12 +110,7 @@ angular.module('openshiftConsole')
                 if (result.failure.length > 0) {
                   result.failure.forEach(
                     function(failure) {
-                      var objectName = "";
-                      if (failure.data && failure.data.details) {
-                        objectName = failure.data.details.kind + " " + failure.data.details.id;
-                      } else {
-                        objectName = "object";
-                      }
+                      var objectName = getFailureObjectName(failure) || "object";
                       alerts.push({
                         type: "error",
                         message: "Cannot create " + objectName + ". ",
@@ -181,4 +176,17 @@ angular.module('openshiftConsole')
         Navigate.toErrorPage("Cannot create from template: the specified template could not be retrieved.");
       }
     );
+
+    function getFailureObjectName(failure) {
+      if (!failure.data || !failure.data.details) {
+        return null;
+      }
+
+      var details = failure.data.details;
+      if (details.kind) {
+        return (details.id) ? details.kind + " " + details.id : details.kind;
+      }
+
+      return details.id;
+    }
   });

Diff for: pkg/assets/bindata.go

@@ -21699,7 +21699,7 @@ null !== a && (b.debug("Generated resource definition:", a), d.push(a));
 };
 } ]), angular.module("openshiftConsole").controller("NewFromTemplateController", [ "$scope", "$http", "$routeParams", "DataService", "$q", "$location", "TaskList", "$parse", "Navigate", function(a, b, c, d, e, f, g, h, i) {
 function j(a) {
-var b = [], c = m(a);
+var b = [], c = n(a);
 return c && c.forEach(function(a) {
 b.push(a.image);
 }), b;
@@ -21708,11 +21708,11 @@ function k(a) {
 var b = [], c = [], d = {};
 return a.items.forEach(function(a) {
 if ("BuildConfig" === a.kind) {
-var e = n(a);
+var e = o(a);
 e && b.push({
 name:e
 });
-var f = o(a);
+var f = p(a);
 f && (d[f] = !0);
 }
 "DeploymentConfig" === a.kind && (c = c.concat(j(a)));
@@ -21730,7 +21730,12 @@ g ? (f = d[g[1]] || {}, f.title = a.annotations[e], d[g[1]] = f) :(g = e.match(c
 }
 return d;
 }
-var m = h("template.controllerTemplate.podTemplate.desiredState.manifest.containers"), n = h("parameters.strategy.stiStrategy.image"), o = h("parameters.output.to.name || parameters.output.DockerImageReference");
+function m(a) {
+if (!a.data || !a.data.details) return null;
+var b = a.data.details;
+return b.kind ? b.id ? b.kind + " " + b.id :b.kind :b.id;
+}
+var n = h("template.controllerTemplate.podTemplate.desiredState.manifest.containers"), o = h("parameters.strategy.stiStrategy.image"), p = h("parameters.output.to.name || parameters.output.DockerImageReference");
 a.projectDisplayName = function() {
 return this.project && this.project.displayName || this.projectName;
 }, a.templateDisplayName = function() {
@@ -21747,8 +21752,8 @@ var c = e.defer();
 return d.createList(b.items, a).then(function(b) {
 var d = [], e = !1;
 b.failure.length > 0 ? b.failure.forEach(function(a) {
-var b = "";
-b = a.data && a.data.details ? a.data.details.kind + " " + a.data.details.id :"object", d.push({
+var b = m(a) || "object";
+d.push({
 type:"error",
 message:"Cannot create " + b + ". ",
 details:a.data.message
@@ -21772,11 +21777,11 @@ details:"Status: " + b.status + ". " + b.data
 }, a.toggleOptionsExpanded = function() {
 a.optionsExpanded = !a.optionsExpanded;
 };
-var p = c.name, q = c.namespace;
-return p ? (a.emptyMessage = "Loading...", a.alerts = [], a.projectName = c.project, a.projectPromise = $.Deferred(), d.get("projects", a.projectName, a).then(function(b) {
+var q = c.name, r = c.namespace;
+return q ? (a.emptyMessage = "Loading...", a.alerts = [], a.projectName = c.project, a.projectPromise = $.Deferred(), d.get("projects", a.projectName, a).then(function(b) {
 a.project = b, a.projectPromise.resolve(b);
-}), void d.get("templates", p, a, {
-namespace:q
+}), void d.get("templates", q, a, {
+namespace:r
 }).then(function(b) {
 a.template = b, a.templateImages = k(b), a.hasParameters = a.template.parameters && a.template.parameters.length > 0, a.optionsExpanded = !1, a.templateUrl = b.metadata.selfLink, b.labels = b.labels || {};
 }, function() {