Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java,v diff -u -r1.10 -r1.11 --- lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java 19 Jul 2007 07:09:47 -0000 1.10 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java 19 Oct 2007 01:15:39 -0000 1.11 @@ -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();