Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan E. Cook2017-08-03 13:53:28 -0400
committerMegumi Telles2017-08-07 10:36:11 -0400
commit24acb1951e9a19c419f489008d9ee8d92c62e401 (patch)
treef9b5621633d068e0610774d84ea529de3458288b
parent71ccd7a7b6c468a664aba608f72d111b506605cb (diff)
downloadorg.eclipse.osee-24acb1951e9a19c419f489008d9ee8d92c62e401.tar.gz
org.eclipse.osee-24acb1951e9a19c419f489008d9ee8d92c62e401.tar.xz
org.eclipse.osee-24acb1951e9a19c419f489008d9ee8d92c62e401.zip
bug: Fix incorrect wordml links
Signed-off-by: Morgan E. Cook <morgan.e.cook@boeing.com> Change-Id: I049da4ba65235146b8a6caaf163600db66a4104f Signed-off-by: Morgan E. Cook <morgan.e.cook@boeing.com>
-rw-r--r--plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/OseeLinkBuilder.java1
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/OseeLinkBuilder.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/OseeLinkBuilder.java
index 6a9c1a757a..ae7448383c 100644
--- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/OseeLinkBuilder.java
+++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/OseeLinkBuilder.java
@@ -155,6 +155,7 @@ public class OseeLinkBuilder {
String toReturn;
if (destLinkType == LinkType.OSEE_SERVER_LINK) {
toReturn = escapeXml(oseeLink);
+ toReturn = toReturn.replaceAll("INSERTGUID", artifact.getGuid());
} else {
toReturn = artifact.getGuid();
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java
index 37d9a11c29..d23c8adf67 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactURL.java
@@ -35,7 +35,7 @@ public class ArtifactURL {
Map<String, String> parameters = new HashMap<>();
parameters.put("sessionId", ClientSessionManager.getSessionId());
parameters.put("context", "osee/loopback");
- parameters.put("guid", artifact.getGuid());
+ parameters.put("guid", "INSERTGUID");
parameters.put("branchUuid", String.valueOf(artifact.getBranch().getGuid()));
parameters.put("isDeleted", String.valueOf(artifact.isDeleted()));

Back to the top