Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -rcdf6f2f634df33835526f791c992eb35bbf0df01 -r6b04e69c42c1f73e069ecb5a735ff97c9f50a0a1 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -rcdf6f2f634df33835526f791c992eb35bbf0df01 -r6b04e69c42c1f73e069ecb5a735ff97c9f50a0a1 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as =================================================================== diff -u -r69c442eb02e0be013812860d6d573f9c6d48c950 -r6b04e69c42c1f73e069ecb5a735ff97c9f50a0a1 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as (.../DesignDataModel.as) (revision 69c442eb02e0be013812860d6d573f9c6d48c950) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as (.../DesignDataModel.as) (revision 6b04e69c42c1f73e069ecb5a735ff97c9f50a0a1) @@ -1134,7 +1134,6 @@ if(target != null && target.direction == BranchConnector.DIR_SINGLE) { activityless = target; - //break; } } } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as =================================================================== diff -u -rd7386d2fcb02d7c398f5b9ec0909cbdad305383c -r6b04e69c42c1f73e069ecb5a735ff97c9f50a0a1 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as (.../GroupMatchingDialog.as) (revision d7386d2fcb02d7c398f5b9ec0909cbdad305383c) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as (.../GroupMatchingDialog.as) (revision 6b04e69c42c1f73e069ecb5a735ff97c9f50a0a1) @@ -93,6 +93,7 @@ public function loadLists() { Debugger.log("Loading Lists: branch length: " + branches.length, Debugger.CRITICAL, "loadLists", "GroupMatchingDialog"); + Debugger.log("Loading Lists: sequences length: " + sequences.length, Debugger.CRITICAL, "loadLists", "GroupMatchingDialog"); Debugger.log("Loading Lists: branching act: " + _branchingActivity.activityUIID, Debugger.CRITICAL, "loadLists", "GroupMatchingDialog"); groups_lst.dataProvider = groups; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as =================================================================== diff -u -rcdf6f2f634df33835526f791c992eb35bbf0df01 -r6b04e69c42c1f73e069ecb5a735ff97c9f50a0a1 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision cdf6f2f634df33835526f791c992eb35bbf0df01) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 6b04e69c42c1f73e069ecb5a735ff97c9f50a0a1) @@ -1170,7 +1170,7 @@ if(validBranches.length > 0) evt.target.scrollContent.branches = validBranches; else - evt.target.scrollContent.sequences = _canvasModel.getCanvas().ddm.getComplexActivityChildren(_canvasModel.selectedItem.activity.activityUIID); + evt.target.scrollContent.sequences = getValidSequences(_canvasModel.getCanvas().ddm.getComplexActivityChildren(_canvasModel.selectedItem.activity.activityUIID)); evt.target.scrollContent.loadLists(); @@ -1198,7 +1198,7 @@ if(validBranches.length > 0) evt.target.scrollContent.branches = validBranches; else - evt.target.scrollContent.sequences = _canvasModel.getCanvas().ddm.getComplexActivityChildren(_canvasModel.selectedItem.activity.activityUIID); + evt.target.scrollContent.sequences = getValidSequences(_canvasModel.getCanvas().ddm.getComplexActivityChildren(_canvasModel.selectedItem.activity.activityUIID)); evt.target.scrollContent.loadLists(); } @@ -1219,6 +1219,22 @@ return branches; } + private function getValidSequences(seqs:Array):Array { + Debugger.log("validating seqs len: " + seqs.length, Debugger.CRITICAL, "getvalidsequences", "PIC*"); + + for(var i=0; i < seqs.length; i++) { + var sequence:SequenceActivity = SequenceActivity(seqs[i]); + Debugger.log("validating seq: " +sequence.title, Debugger.CRITICAL, "getvalidsequences", "PIC*"); + Debugger.log("validating seq default + empty: " + (sequence.isDefault && sequence.empty), Debugger.CRITICAL, "getvalidsequences", "PIC*"); + if(sequence.isDefault && sequence.empty) { + seqs.splice(i, 1); + i=i-1; + } + } + + return seqs; + } + public function onDefaultBranchSelect(evt:Object):Void { if(_pi_defaultBranch_cb.selected) { _canvasModel.activeView.activity.defaultBranch = BranchConnector(_canvasModel.selectedItem).branch;