CSVImportWizard now resets keyType when "generate" checkbox is selected

Change-Id: I12752713126b1bce3df7a751213cd781df378369
WeaveTeam · Sep 28, 2011 · 357b979 · 357b979
1 parent adb6c42
commit 357b979
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/JTDS_SqlServerDriver/.gitignore b/JTDS_SqlServerDriver/.gitignore
@@ -0,0 +1 @@
+bin
diff --git a/WeaveAdmin/src/weave/ui/admin/GeometryCollectionDialog.mxml b/WeaveAdmin/src/weave/ui/admin/GeometryCollectionDialog.mxml
@@ -67,7 +67,7 @@
 			{
 				if(keyTypeRadio.selected)
 					return keyTypeCombo.text;
-				else return'';
+				else return '';
 			}
 			
 			[Bindable] public var keyType:String = "";
@@ -82,7 +82,7 @@
 	</mx:HBox>
 	<mx:HBox>
 		<mx:RadioButton id="keyTypeRadio" group="{shapeOrKey}" selected="true" label="{StringDefinition.DEFAULT_KEY_TYPE_RADIOBUTTON_LABEL}" textAlign="left" width="{_indent}" toolTip="{StringDefinition.DEFAULT_KEY_TYPE_RADIOBUTTON_TOOLTIP}"/> 
-		<ui:CustomComboBox id="keyTypeCombo" editable="true" text="{keyType}" enabled="{keyTypeRadio.selected}" dataProvider="{AdminInterface.instance.keyTypes}" change="keyType = keyTypeCombo.text" toolTip="{StringDefinition.DEFAULT_KEY_TYPE_DROPDOWNBOX_TOOLTIP}"/>
+		<ui:CustomComboBox id="keyTypeCombo" editable="true" text="{keyType}" enabled="{keyTypeRadio.selected}" dataProvider="{AdminInterface.instance.keyTypes}" toolTip="{StringDefinition.DEFAULT_KEY_TYPE_DROPDOWNBOX_TOOLTIP}" valueCommit="keyType = keyTypeCombo.text"/>
 		<mx:Button label="Refresh" enabled="{keyTypeRadio.selected}" click="AdminInterface.instance.getKeyTypes()" toolTip="{StringDefinition.DEFAULT_KEY_TYPES_REFRESH_BUTTON_TOOLTIP}"/>
 		<!--mx:Button label="?" click="showHelpForKeyType()"/-->
 	</mx:HBox>

diff --git a/WeaveAdmin/src/weave/ui/admin/wizards/CSVImportWizard.mxml b/WeaveAdmin/src/weave/ui/admin/wizards/CSVImportWizard.mxml
@@ -54,6 +54,7 @@
 		</mx:HBox>
 		<mx:CheckBox id="generateKeyColumn" selected="true"
 					 label="Generate a new primary key column"
+					 change="if (generateKeyColumn.selected) geometrySelector.keyType = dataTableNameInput.text;"
 					 toolTip="Checking this box will generate a new unique key for each row."/>
 		<ui:Indent>
 			<mx:VBox visible="{!generateKeyColumn.selected}">
@@ -63,7 +64,7 @@
 				</mx:HBox>
 				<mx:Label text="What do these keys correspond to?"/>
 				<ui:Indent>
-					<admin:GeometryCollectionDialog id="geometrySelector" keyType="{tableSelector.activeTable}"/>
+					<admin:GeometryCollectionDialog id="geometrySelector" keyType="{dataTableNameInput.text}"/>
 				</ui:Indent>
 				<mx:CheckBox id="secondaryKeyColumnCheckBox" label="Format data for Dimension Slider" selected="false"/>
 				<ui:Indent>