Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r8421e7ac31dfc91c270abaa048eccba2a59afaae -r5c5f0b9b919241a47311827fff78276693cb7933 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r8421e7ac31dfc91c270abaa048eccba2a59afaae -r5c5f0b9b919241a47311827fff78276693cb7933 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -r65b93154434968657e32949992a29bb8c98e08e1 -r5c5f0b9b919241a47311827fff78276693cb7933 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 65b93154434968657e32949992a29bb8c98e08e1) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 5c5f0b9b919241a47311827fff78276693cb7933) @@ -356,14 +356,14 @@ if(defaultSequenceActivity == null) - createInitialSequenceActivity(); + createInitialSequenceActivity(sequenceActs.length+1); model.haltRefresh(false); } - private function createInitialSequenceActivity() { - model.createNewSequenceActivity(activity); + private function createInitialSequenceActivity(num:Number) { + model.createNewSequenceActivity(activity, num, null, true); } public function localOnRelease():Void{ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as =================================================================== diff -u -red0751bf76b6e95126836f3d8a51c7f60277a742 -r5c5f0b9b919241a47311827fff78276693cb7933 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision ed0751bf76b6e95126836f3d8a51c7f60277a742) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision 5c5f0b9b919241a47311827fff78276693cb7933) @@ -207,11 +207,12 @@ setSelectedItem(_activitiesDisplayed.get(branchingActivity.activityUIID)); } - public function createNewSequenceActivity(parent, orderID, stopAfterActivity:Boolean){ + public function createNewSequenceActivity(parent, orderID, stopAfterActivity:Boolean, isBranch:Boolean){ Debugger.log('Running...',Debugger.GEN,'createNewSequenceActivity','CanvasModel'); var seqAct = new SequenceActivity(_cv.ddm.newUIID()); - seqAct.title = Dictionary.getValue('sequence_act_title'); + var title = (isBranch) ? Dictionary.getValue('branch_mapping_dlg_branch_col_lbl') : Dictionary.getValue('sequence_act_title'); + seqAct.title = Dictionary.getValue('sequence_act_title_new', [title, orderID]); seqAct.learningDesignID = _cv.ddm.learningDesignID; seqAct.groupingSupportType = Activity.GROUPING_SUPPORT_OPTIONAL; seqAct.activityCategoryID = Activity.CATEGORY_SYSTEM; @@ -866,7 +867,7 @@ var b = new Branch(_cv.ddm.newUIID(), BranchConnector.DIR_FROM_START, toAct.activityUIID, activeView.startHub.activity.activityUIID, activeView.defaultSequenceActivity, _cv.ddm.learningDesignID); b.sequenceActivity.isDefault = false; - createNewSequenceActivity(activeView.activity); + createNewSequenceActivity(activeView.activity, _cv.ddm.getComplexActivityChildren(sequence.parentUIID).length+1, null, true); return b; } } @@ -912,7 +913,7 @@ Debugger.log("sequence: " + b.sequenceActivity.activityUIID, Debugger.CRITICAL, "createActivitylessBranch", "CanvasModel"); Debugger.log("isDefault: " + b.sequenceActivity.isDefault, Debugger.CRITICAL, "createActivitylessBranch", "CanvasModel"); - createNewSequenceActivity(activeView.activity); + createNewSequenceActivity(activeView.activity, _cv.ddm.getComplexActivityChildren(b.sequenceActivity.parentUIID).length+1, null, true); return b; }