Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -rd692ec6f9bf348950e680556e307e32f1d504cbd -rb045886e86cb40c9f12c589a7e1000ec3c89177a Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -rd692ec6f9bf348950e680556e307e32f1d504cbd -rb045886e86cb40c9f12c589a7e1000ec3c89177a Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as =================================================================== diff -u -r6f4fd0fe7fee43ab750ec98ea12fb3f1b4cb07b5 -rb045886e86cb40c9f12c589a7e1000ec3c89177a --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as (.../ToolActivity.as) (revision 6f4fd0fe7fee43ab750ec98ea12fb3f1b4cb07b5) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as (.../ToolActivity.as) (revision b045886e86cb40c9f12c589a7e1000ec3c89177a) @@ -51,6 +51,7 @@ private var _supportsDefineLater:Boolean; private var _supportsModeration:Boolean; private var _supportsRunOffline:Boolean; + private var _supportsOutputs:Boolean; private var _toolOutputDefinitions:Hashtable; @@ -165,6 +166,8 @@ _supportsContribute = dto.supportsContribute; _supportsDefineLater = dto.supportsDefineLater; _supportsModeration = dto.supportsRunOffline + _supportsOutputs = dto.supportsOutputs; + activityToolContentID = _toolContentID; //maybe return isValid(); @@ -239,6 +242,7 @@ n.supportsContribute = _supportsContribute; n.supportsDefineLater = _supportsDefineLater; n.supportsModeration = _supportsRunOffline; + n.supportsOutputs = _supportsOutputs; return n; @@ -421,9 +425,27 @@ return _supportsRunOffline; } -/** + /** * * @usage + * @param newsupportsRunOffline + * @return + */ + public function set supportsOutputs (newsupportsOutputs:Boolean):Void { + _supportsOutputs = newsupportsOutputs; + } + /** + * + * @usage + * @return + */ + public function get supportsOutputs ():Boolean { + return _supportsOutputs; + } + + /** + * + * @usage * @param newmonitoringUrl * @return */ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as =================================================================== diff -u -rb3d9e6021b71dcb7f55a13a2508e80a21141baf9 -rb045886e86cb40c9f12c589a7e1000ec3c89177a --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as (.../CanvasSuperModel.as) (revision b3d9e6021b71dcb7f55a13a2508e80a21141baf9) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as (.../CanvasSuperModel.as) (revision b045886e86cb40c9f12c589a7e1000ec3c89177a) @@ -176,8 +176,11 @@ if(_activity != null) { if(_activity instanceof _class) { - if(isBranching) tActivities.addItem({label: _activity.title, data: _activity.activityUIID}); - else tActivities.addItem({label: _activity.title, data: _activity}); + Debugger.log("activity supports Outputs: " + ToolActivity(_activity).supportsOutputs, Debugger.CRITICAL, "getDownstreamActivities", "CanvasSuperModel"); + + if(isBranching) { + if(ToolActivity(_activity).supportsOutputs) tActivities.addItem({label: _activity.title, data: _activity.activityUIID}); + } else { tActivities.addItem({label: _activity.title, data: _activity}); } } else if(_activity instanceof ComplexActivity) { if(!isBranching && !_activity.isOptionalActivity() && !_activity.isSequenceActivity()) getActivitiesFromComplexByClass(_activity.activityUIID, tActivities, _class, isBranching); @@ -198,8 +201,9 @@ for(var i=0; i