Index: lams_central/web/includes/javascript/authoring/authoringProperty.js
===================================================================
diff -u -r287e1d4f1242a8d584f71cab96bfd0365b6855c8 -rde6734598568f3d6f4363883d503b9802ed4fba1
--- lams_central/web/includes/javascript/authoring/authoringProperty.js	(.../authoringProperty.js)	(revision 287e1d4f1242a8d584f71cab96bfd0365b6855c8)
+++ lams_central/web/includes/javascript/authoring/authoringProperty.js	(.../authoringProperty.js)	(revision de6734598568f3d6f4363883d503b9802ed4fba1)
@@ -1079,19 +1079,21 @@
 						// build output dropdown and bind data to each option
 						$.each(activity.input.outputDefinitions,function(){
 							var suffix = '';
-							switch(this.type) {
-								case 'OUTPUT_COMPLEX' :
-									suffix = LABELS.COMPLEX_OUTPUT_SUFFIX;
-									break;
-														
-								case 'OUTPUT_LONG' :
-									suffix = LABELS.RANGE_OUTPUT_SUFFIX;
-									break;
-									
-								case 'OUTPUT_BOOLEAN' :
-									suffix = LABELS.BOOLEAN_OUTPUT_SUFFIX;
-									break;
-							};
+							if (!this.showConditionNameOnly) {
+								switch(this.type) {
+									case 'OUTPUT_COMPLEX' :
+										suffix = LABELS.COMPLEX_OUTPUT_SUFFIX;
+										break;
+															
+									case 'OUTPUT_LONG' :
+										suffix = LABELS.RANGE_OUTPUT_SUFFIX;
+										break;
+										
+									case 'OUTPUT_BOOLEAN' :
+										suffix = LABELS.BOOLEAN_OUTPUT_SUFFIX;
+										break;
+								};
+							}
 			
 							this.toolActivityUIID = activity.input.uiid;
 							var option = $('<option />')
@@ -1730,6 +1732,11 @@
 			return;
 		}
 
+		var conditionsLength = activity.input.outputDefinitions.length;
+		ActivityLib.getOutputDefinitions(activity.input);
+		if (conditionsLength != activity.input.outputDefinitions.length) {
+			PropertyLib.fillOutputDefinitionsDropdown(activity.input);
+		}
 		layout.outputConditionsDialog.data('parentObject', activity)
 			  						 .modal('show');
 	},