Merge pull request #1779 from anotherchrisberry/netflix-overrides-bad…

…-recursion graph perf fix; correct netflix override template
spinnaker · Dec 4, 2015 · 63e8f70 · 63e8f70
2 parents 1f60e2b + 40dc430
commit 63e8f70
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/scripts/modules/core/pipeline/config/graph/pipeline.graph.directive.js b/app/scripts/modules/core/pipeline/config/graph/pipeline.graph.directive.js
@@ -156,6 +156,8 @@ module.exports = angular.module('spinnaker.core.pipeline.config.graph.directive'
  node.children = _.uniq(node.children);
  node.parents = _.uniq(node.parents);
  node.leaf = node.children.length === 0;
+ });
+ nodes.forEach((node) => {
  node.lastPhase = getLastPhase(node);
  });
 

diff --git a/app/scripts/modules/netflix/templateOverride/templateOverrides.module.js b/app/scripts/modules/netflix/templateOverride/templateOverrides.module.js
@@ -18,7 +18,7 @@ module.exports = angular
  { key: 'pipelineConfigActions', value: require('./pipelineConfigActions.html') },
  { key: 'spinnakerHeader', value: require('./spinnakerHeader.html') },
  { key: 'aws.serverGroup.securityGroups', value: require('../serverGroup/awsServerGroupSecurityGroups.html') },
- { key: 'aws.serverGroup.capacity', value: require('../serverGroup/awsServerGroupSecurityGroups.html') },
+ { key: 'aws.serverGroup.capacity', value: require('../serverGroup/capacity/awsServerGroupCapacity.html') },
  { key: 'aws.resize.modal', value: require('../serverGroup/resize/awsResizeServerGroup.html') },
  ];
  templates.forEach((template) => overrideRegistry.overrideTemplate(template.key, template.value));