Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan E. Cook2016-10-05 14:48:05 -0400
committerMegumi Telles2016-10-06 10:18:13 -0400
commit5bd2fa1e5e3635e9cb40eecea82adaba81816814 (patch)
tree0aaf1c35dc56b9f959153e0c2cb1b072e933662d
parent0357dc0151a4c7e13bb41405324d959fc3457cd2 (diff)
downloadorg.eclipse.osee-5bd2fa1e5e3635e9cb40eecea82adaba81816814.tar.gz
org.eclipse.osee-5bd2fa1e5e3635e9cb40eecea82adaba81816814.tar.xz
org.eclipse.osee-5bd2fa1e5e3635e9cb40eecea82adaba81816814.zip
bug: Fix landscape not working on publish w specified template blam
Change-Id: Ie383058f946fe132002f7f3da9b48c1ff232bc4d Signed-off-by: Morgan E. Cook <Morgan.e.cook@boeing.com>
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java
index 68fdb0a6b2..081c9ea70f 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateProcessor.java
@@ -569,7 +569,8 @@ public class WordTemplateProcessor {
private void populateRequest(List<Artifact> artifacts, DataRightInput request) {
if (request.isEmpty()) {
List<Artifact> allArtifacts = new ArrayList<>();
- if (recurseChildren) {
+ if (recurseChildren || (renderer.getBooleanOption(
+ RECURSE_ON_LOAD) && !renderer.getBooleanOption("Orig Publish As Diff"))) {
for (Artifact art : artifacts) {
allArtifacts.add(art);
if (!art.isHistorical()) {
@@ -585,7 +586,8 @@ public class WordTemplateProcessor {
for (Artifact artifact : allArtifacts) {
String classification = null;
- if (overrideClassification != null && ITemplateRenderer.DataRightsClassification.isValid(overrideClassification)) {
+ if (overrideClassification != null && ITemplateRenderer.DataRightsClassification.isValid(
+ overrideClassification)) {
classification = overrideClassification;
} else {
classification = artifact.getSoleAttributeValueAsString(CoreAttributeTypes.DataRightsClassification, "");

Back to the top