From d253245c96a60b0eb16123041e9a9fe1a6a15981 Mon Sep 17 00:00:00 2001 From: AccentuSoft Date: Tue, 21 Dec 2021 01:45:08 -0500 Subject: [PATCH] Fixed bug with merging entities. --- LinkScope.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/LinkScope.py b/LinkScope.py index c66a7b8..6e55ec2 100644 --- a/LinkScope.py +++ b/LinkScope.py @@ -519,11 +519,13 @@ class MainWindow(QtWidgets.QMainWindow): if str(primaryEntity.get(field)) == 'None': primaryEntity[field] = otherEntity[field] for incomingLink in allIncomingLinks: - linksToAdd.append([incomingLink[0], primaryEntity['uid'], incomingLink['Resolution'], - incomingLink['Notes']]) + linkJson = self.LENTDB.getLink(incomingLink) + linksToAdd.append([incomingLink[0], primaryEntity['uid'], linkJson['Resolution'], + linkJson['Notes']]) for outgoingLink in allOutgoingLinks: - linksToAdd.append([primaryEntity['uid'], outgoingLink[1], outgoingLink['Resolution'], - outgoingLink['Notes']]) + linkJson = self.LENTDB.getLink(outgoingLink) + linksToAdd.append([primaryEntity['uid'], outgoingLink[1], linkJson['Resolution'], + linkJson['Notes']]) self.deleteSpecificEntity(entityUID) self.centralWidget().tabbedPane.linkAddHelper(linksToAdd)