Merge pull request #3502 from anotherchrisberry/sa-sg-et

fix(securitygroups): render entity tags on standalone security groups
spinnaker · Apr 8, 2017 · 609a649 · 609a649
2 parents 512dcf1 + 717a216
commit 609a649
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/scripts/modules/core/securityGroup/securityGroupReader.service.ts b/app/scripts/modules/core/securityGroup/securityGroupReader.service.ts
@@ -295,7 +295,7 @@ export class SecurityGroupReader {
     return this.entityTagsReader.getAllEntityTags('securitygroup', entityIds).then(tags => {
       securityGroups.forEach(securityGroup => {
         securityGroup.entityTags = tags.find(t => t.entityRef.entityId === securityGroup.name &&
-        t.entityRef['account'] === securityGroup.account &&
+        t.entityRef['account'] === securityGroup.accountName &&
         t.entityRef['region'] === securityGroup.region);
       });
       return securityGroups;
@@ -392,7 +392,9 @@ export class SecurityGroupReader {
             }
           });
         }
-
+        if (SETTINGS.feature.entityTags && application.isStandalone) {
+          return this.addEntityTags([details]).then(all => all[0]);
+        }
         return details;
       });
   }