Skip to content

Commit

Permalink
fix(merge-tool): Use parentAlias for deleted entities
Browse files Browse the repository at this point in the history
This got borked during a rebase I think
  • Loading branch information
MonkeyDo committed May 8, 2020
1 parent 2bb0ef8 commit 1e4df8a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/client/helpers/entity.js
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@ export function getEntityLabel(entity, returnHTML = true) {
// Deleted entities
if (!entity.dataId) {
let deletedEntityName = `Deleted ${entity.type} ${entity.bbid}`;
if (entity.defaultAlias) {
deletedEntityName = entity.defaultAlias.name;
if (entity.parentAlias) {
deletedEntityName = entity.parentAlias.name;
}
if (returnHTML) {
return <span className="text-muted deleted" title={`Deleted ${entity.type}`}>{deletedEntityName}</span>;
Expand Down

0 comments on commit 1e4df8a

Please sign in to comment.