Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java =================================================================== diff -u -r2c26811b29dbe08f4d569c720f86b25925260fc0 -r5d5d1d9caee24d6fd66747c24150efce8be6e8df --- lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java (.../PortfolioBuilder.java) (revision 2c26811b29dbe08f4d569c720f86b25925260fc0) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java (.../PortfolioBuilder.java) (revision 5d5d1d9caee24d6fd66747c24150efce8be6e8df) @@ -137,7 +137,8 @@ complexPortfolio.setHeadingNoPage(true); } } - + if ( activity.isSequenceActivity() && activity.getParentActivity() != null && activity.getParentActivity().isBranchingActivity() ) + currentPortfolioList = (ArrayList) activityListStack.pop(); if ( complexPortfolio != null ) currentPortfolioList.add(complexPortfolio); @@ -221,6 +222,13 @@ */ private String getExportURLForSystemTool(Activity activity) { + // At present the sequence activity always has a page, which is a bit redundant for when it is a branch. + // If we just want the sequence activity to be a heading when it is a branch (rather than in an optional activity) + // then uncomment this code. + // if ( activity.isSequenceActivity() && activity.getParentActivity() != null && activity.getParentActivity().isBranchingActivity() ) { + // return null; + //} + String exportUrlForTool = null; ISystemToolActivity sysToolActivity = (ISystemToolActivity) activity; SystemTool tool = sysToolActivity.getSystemTool();