Fix edge case for workflow mapping handling when tools not available.

Fixes #3960.
This commit is contained in:
John Chilton
2017-04-24 14:12:14 -04:00
parent 1fe9c4d066
commit 60e00088c8
3 changed files with 7 additions and 5 deletions
@@ -428,9 +428,11 @@ define(['mvc/workflow/workflow-globals'], function( Globals ) {
if( ! canMatch ) {
for( var collectionTypeIndex in collectionTypes ) {
var collectionType = collectionTypes[collectionTypeIndex];
var effectiveMapOver = otherCollectionType.effectiveMapOver( collectionType );
if( effectiveMapOver != NULL_COLLECTION_TYPE_DESCRIPTION ) {
return effectiveMapOver;
if( otherCollectionType.canMapOver( collectionType ) ) {
var effectiveMapOver = otherCollectionType.effectiveMapOver( collectionType );
if( effectiveMapOver != NULL_COLLECTION_TYPE_DESCRIPTION ) {
return effectiveMapOver;
}
}
}
}
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long