Просмотр исходного кода

修正 request.form 写成 request.json 的bug,并美好初始化页面 磁盘类型 单选框

James Iter 8 лет назад
Родитель
Сommit
940c738c02
2 измененных файлов с 17 добавлено и 12 удалено
  1. 7 2
      templates/config_init.html
  2. 10 10
      views/config.py

+ 7 - 2
templates/config_init.html

@@ -161,14 +161,19 @@
                         <div class="form-group">
                             <label class="col-sm-2 control-label">虚拟机磁盘存放路径</label>
                             <div class="col-sm-3">
-                                <input title="虚拟机磁盘存放路径" class="form-control" name="storage_path" type="text" value="/Images">
+                                <input title="虚拟机磁盘存放路径" class="form-control" name="storage_path" type="text" value="/opt/Images">
                             </div>
                             <!-- HDD for Hard Disk Drive -->
                             <label id="hdd_type_label" class="col-sm-2 control-label">磁盘类型</label>
-                            <div class="col-sm-3">
+                            <div class="col-sm-1">
                                 <label>STAT<input class="form-control" name="hdd_type" type="radio" value="stat" onclick="hdd_type_select(this)" /></label>
+                            </div>
+                            <div class="col-sm-1">
                                 <label>SAS<input class="form-control" name="hdd_type" type="radio" checked value="sas" onclick="hdd_type_select(this)" /></label>
+                            </div>
+                            <div class="col-sm-1">
                                 <label>SSD<input class="form-control" name="hdd_type" type="radio" value="ssd" onclick="hdd_type_select(this)" /></label>
+                            </div>
                                 <input class="form-control" id="iops_base" name="iops_base" type="hidden" value="1000" />
                                 <input class="form-control" id="iops_pre_unit" name="iops_pre_unit" type="hidden" value="6" />
                                 <input class="form-control" id="iops_cap" name="iops_cap" type="hidden" value="2000" />

+ 10 - 10
views/config.py

@@ -51,20 +51,20 @@ def create():
             'gateway': request.form.get('gateway'),
             'dns1': request.form.get('dns1'),
             'dns2': request.form.get('dns2'),
-            'iops_base': int(request.json.get('iops_base', 1000)),
-            'iops_pre_unit': int(request.json.get('iops_pre_unit', 6)),
-            'iops_cap': int(request.json.get('iops_cap', 2000)),
-            'iops_max': int(request.json.get('iops_max', 3000)),
-            'iops_max_length': int(request.json.get('iops_max_length', 20)),
+            'iops_base': int(request.form.get('iops_base', 1000)),
+            'iops_pre_unit': int(request.form.get('iops_pre_unit', 6)),
+            'iops_cap': int(request.form.get('iops_cap', 2000)),
+            'iops_max': int(request.form.get('iops_max', 3000)),
+            'iops_max_length': int(request.form.get('iops_max_length', 20)),
             # 200 MiB
-            'bps_base': int(request.json.get('bps_base', 1024 * 1024 * 200)),
+            'bps_base': int(request.form.get('bps_base', 1024 * 1024 * 200)),
             # 0.1 MiB
-            'bps_pre_unit': int(request.json.get('bps_pre_unit', 1024 * 1024 / 10)),
+            'bps_pre_unit': int(request.form.get('bps_pre_unit', 1024 * 1024 / 10)),
             # 500 MiB
-            'bps_cap': int(request.json.get('bps_cap', 1024 * 1024 * 500)),
+            'bps_cap': int(request.form.get('bps_cap', 1024 * 1024 * 500)),
             # 1 GiB
-            'bps_max': int(request.json.get('bps_max', 1024 * 1024 * 1024)),
-            'bps_max_length': int(request.json.get('bps_max_length', 10))
+            'bps_max': int(request.form.get('bps_max', 1024 * 1024 * 1024)),
+            'bps_max_length': int(request.form.get('bps_max_length', 10))
         }
 
         url = host_url + '/api/config'