small fix

cookpad · Sep 2, 2012 · d30dcc5 · d30dcc5
1 parent 8f639f6
commit d30dcc5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ec2ui/content/ec2ui/controller.js b/ec2ui/content/ec2ui/controller.js
@@ -91,7 +91,7 @@ var ec2ui_controller = {
         if (snapshotId != null) params.push(["SnapshotId", snapshotId]);
         if (zone != null) params.push(["AvailabilityZone", zone]);
         if (volumeType != null) params.push(["VolumeType", volumeType]);
-        if (iops != null) params.push(["Iops", iops]);
+        if (volumeType && volumeType != 'standard' && iops != null) params.push(["Iops", iops]);
         ec2_httpclient.queryEC2("CreateVolume", params, this, true, "onCompleteCreateVolume", callback);
     },
 

diff --git a/ec2ui/content/ec2ui/dialog_new_volume.xul b/ec2ui/content/ec2ui/dialog_new_volume.xul
@@ -31,11 +31,11 @@
         </row>
         <row>
           <label control="ec2ui.newvolume.volumetypelist" value="&ec2ui.volumes.volumeType.label;" />
-          <menulist id="ec2ui.newvolume.volumetypelist" />
+          <menulist id="ec2ui.newvolume.volumetypelist" oncommand="document.getElementById('ec2ui.newvolume.iops').disabled = (this.value == 'standard');" />
         </row>
         <row>
           <label control="ec2ui.newvolume.iops" value="&ec2ui.volumes.iops.label;" />
-          <textbox id="ec2ui.newvolume.iops" size="40" />
+          <textbox id="ec2ui.newvolume.iops" size="40" value="100" disabled="true" />
         </row>
         <row>
           <label control="ec2ui.newvolume.tag" value="Tag" />