Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -ra48c290e0fee977ddb67b61b82311edf6dc89880 -rb27a8c9cdf8a0d0ff46fe4ecb91461c9c8d917f0 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -ra48c290e0fee977ddb67b61b82311edf6dc89880 -rb27a8c9cdf8a0d0ff46fe4ecb91461c9c8d917f0 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as =================================================================== diff -u -ra0391f9239dd0b510838649eb1b1c7c207412ff3 -rb27a8c9cdf8a0d0ff46fe4ecb91461c9c8d917f0 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as (.../Application.as) (revision a0391f9239dd0b510838649eb1b1c7c207412ff3) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as (.../Application.as) (revision b27a8c9cdf8a0d0ff46fe4ecb91461c9c8d917f0) @@ -22,6 +22,7 @@ */ import org.lamsfoundation.lams.authoring.* //Design Data model n stuffimport org.lamsfoundation.lams.authoring.* //Design Data model n stuff +import org.lamsfoundation.lams.authoring.br.CanvasBranchView import org.lamsfoundation.lams.authoring.tk.* //Toolkit import org.lamsfoundation.lams.authoring.tb.* //Toolbar import org.lamsfoundation.lams.authoring.cv.* //Canvas @@ -584,10 +585,12 @@ public function copy():Void{ var ca = _canvas.model.selectedItem - if (CanvasActivity(ca) != null){ + if (ca != null){ if (ca.activity.parentUIID == null || ca.activity.parentUIID == undefined){ setClipboardData(ca, COPY_TYPE); - }else { + } else if(_canvas.model.activeView instanceof CanvasBranchView && canvas.ddm.getActivityByUIID(ca.activity.parentUIID).parentUIID == canvas.model.activeView.activity.activityUIID) { + setClipboardData(ca, COPY_TYPE); + } else { LFMessage.showMessageAlert(Dictionary.getValue('cv_activity_copy_invalid')); } }else{ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as =================================================================== diff -u -ra0391f9239dd0b510838649eb1b1c7c207412ff3 -rb27a8c9cdf8a0d0ff46fe4ecb91461c9c8d917f0 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as (.../CanvasHelper.as) (revision a0391f9239dd0b510838649eb1b1c7c207412ff3) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as (.../CanvasHelper.as) (revision b27a8c9cdf8a0d0ff46fe4ecb91461c9c8d917f0) @@ -476,15 +476,16 @@ * @return */ public function setPastedItem(o:Object){ - if(o.data instanceof CanvasActivity){ + if(o.data instanceof CanvasActivity && o.data.activity.activityCategoryID != Activity.CATEGORY_SYSTEM){ Debugger.log('instance is CA',Debugger.GEN,'setPastedItem','Canvas'); var callback:Function = Proxy.create(this, setNewContentID, o); Application.getInstance().getComms().getRequest('authoring/author.do?method=copyToolContent&toolContentID='+o.data.activity.toolContentID+'&userID='+_root.userID,callback, false); } else if(o.data instanceof ToolActivity){ Debugger.log('instance is Tool',Debugger.GEN,'setPastedItem','Canvas'); var callback:Function = Proxy.create(this, setNewContentID, o); Application.getInstance().getComms().getRequest('authoring/author.do?method=copyToolContent&toolContentID='+o.toolContentID+'&userID='+_root.userID,callback, false); - } else{ + } else{ + LFMessage.showMessageAlert(Dictionary.getValue('al_activity_paste_invalid')); Debugger.log('Cant paste this item!',Debugger.GEN,'setPastedItem','Canvas'); } }