Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormegumi.telles2018-02-02 19:54:12 +0000
committermegumi.telles2018-02-02 19:55:29 +0000
commit67801f3aef6ba3f18a9bf89c0560c2d7406c2b38 (patch)
tree2f77a414404df534fdea12a3130fafa44760a913 /plugins
parent1964df07c2e8545d172c25a3d75fd40b497be83c (diff)
downloadorg.eclipse.osee-67801f3aef6ba3f18a9bf89c0560c2d7406c2b38.tar.gz
org.eclipse.osee-67801f3aef6ba3f18a9bf89c0560c2d7406c2b38.tar.xz
org.eclipse.osee-67801f3aef6ba3f18a9bf89c0560c2d7406c2b38.zip
bug: Add merge branch check for applicability
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordUpdateArtifact.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordUpdateArtifact.java b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordUpdateArtifact.java
index b57c6509db1..eaec610f1b2 100644
--- a/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordUpdateArtifact.java
+++ b/plugins/org.eclipse.osee.define.report/src/org/eclipse/osee/define/report/internal/wordupdate/WordUpdateArtifact.java
@@ -257,6 +257,10 @@ public class WordUpdateArtifact {
}
private HashSet<String> getValidConfigurations(BranchId branch) {
+ BranchReadable br = orcsApi.getQueryFactory().branchQuery().andId(branch).getResults().getOneOrNull();
+ if (br.getBranchType().equals(BranchType.MERGE)) {
+ branch = br.getParentBranch();
+ }
return WordMLApplicabilityHandler.getValidConfigurations(orcsApi, branch);
}
}

Back to the top