调整默认页面大小

jimvc/api/disk.py

@@ -450,7 +450,7 @@ def r_show():
         page = 1
     page = int(page)
 
-    page_size = int(request.args.get('page_size', 10))
+    page_size = int(request.args.get('page_size', 20))
     keyword = request.args.get('keyword', None)
     show_area = request.args.get('show_area', 'unmount')
     guest_uuid = request.args.get('guest_uuid', None)

jimvc/api/guest.py

@@ -200,7 +200,6 @@ def r_create():
         ip_pool = IPPool()
         ip_pool.id = rows[0]['id']
         ip_pool.get()
-        assert isinstance(ip_pool, IPPool)
 
         guest_ip_generator = ip_pool.ip_generator(occupied_ips=occupied_ips)
         guest_vnc_port_generator = ip_pool.vnc_port_generator(occupied_vnc_ports=occupied_vnc_ports)
@@ -1555,7 +1554,7 @@ def r_refresh_guest_state():
 def r_show():
     args = list()
     page = int(request.args.get('page', 1))
-    page_size = int(request.args.get('page_size', 10))
+    page_size = int(request.args.get('page_size', 20))
     keyword = request.args.get('keyword', None)
 
     if page is not None:

jimvc/models/event_processor.py

@@ -5,7 +5,6 @@
 import traceback
 import json
 import time
-from IPy import IP
 import jimit as ji
 
 from jimvc.models import logger, app_config

jimvc/themes/default/templates/config_init.html

@@ -46,13 +46,6 @@
             storage_mode: parseInt($('#storage_mode').val()),
             vm_network: $('#vm_network').val(),
             vm_manage_network: $('#vm_manage_network').val(),
-            start_ip: $('#start_ip').val(),
-            end_ip: $('#end_ip').val(),
-            netmask: $('#netmask').val(),
-            gateway: $('#gateway').val(),
-            dns1: $('#dns1').val(),
-            dns2: $('#dns2').val(),
-            start_vnc_port: parseInt($('#start_vnc_port').val()),
             dfs_volume: $('#dfs_volume').val(),
             storage_path: $('#storage_path').val(),
             hdd_type: $('#hdd_type').val(),
@@ -160,42 +153,6 @@
                                 <input title="Guest 管理网络" class="form-control" id="vm_manage_network" name="vm_manage_network" type="text" value="net-br0">
                             </div>
                         </div>
-                        <div class="form-group">
-                            <label class="col-sm-2 control-label">起始 IP</label>
-                            <div class="col-sm-3">
-                                <input title="起始 IP" class="form-control" id="start_ip" name="start_ip" type="text" value="10.10.1.1">
-                            </div>
-                            <label class="col-sm-2 control-label">截止 IP</label>
-                            <div class="col-sm-3">
-                                <input title="截止 IP" class="form-control" id="end_ip" name="end_ip" type="text" value="10.10.15.253">
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label class="col-sm-2 control-label">子网掩码</label>
-                            <div class="col-sm-3">
-                                <input title="子网掩码" class="form-control" id="netmask" name="netmask" type="text" value="255.255.240.0">
-                            </div>
-                            <label class="col-sm-2 control-label">网关</label>
-                            <div class="col-sm-3">
-                                <input title="网关" class="form-control" id="gateway" name="gateway" type="text" value="10.10.15.254">
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label class="col-sm-2 control-label">DNS1</label>
-                            <div class="col-sm-3">
-                                <input title="DNS1" class="form-control" id="dns1" name="dns1" type="text" value="223.5.5.5">
-                            </div>
-                            <label class="col-sm-2 control-label">DNS2</label>
-                            <div class="col-sm-3">
-                                <input title="DNS2" class="form-control" id="dns2" name="dns2" type="text" value="8.8.8.8">
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label class="col-sm-2 control-label">起始 VNC 端口</label>
-                            <div class="col-sm-3">
-                                <input title="起始 VNC 端口" class="form-control" id="start_vnc_port" name="start_vnc_port" type="text" value="15900">
-                            </div>
-                        </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label">虚拟机磁盘存储模式</label>
                             <div class="col-sm-3">

jimvc/themes/default/templates/disks_show.html

@@ -78,7 +78,7 @@
 
 <script type="text/javascript">
     var page = 1;
-    var page_size = 10;
+    var page_size = 20;
     var keyword = '';
     var show_area = '';
     var resource_path = window.location.pathname;
@@ -727,9 +727,9 @@
                                 <div class="col-sm-3" style="font-size: 12px; padding-top: 5px; text-align: right;">
                                     共有{{ paging.total }}条，每页显示：
                                     <select id="page_size" name="datatable-row-highlight_length" title="page_size" class="form-control" style="height: 22px; vertical-align: baseline;">
-                                        <option value="10" {% if page_size == 10 %} selected {% endif %}>10</option>
                                         <option value="20" {% if page_size == 20 %} selected {% endif %}>20</option>
-                                        <option value="50" {% if page_size == 50  %} selected {% endif %}>50</option>
+                                        <option value="50" {% if page_size == 50 %} selected {% endif %}>50</option>
+                                        <option value="100" {% if page_size == 100  %} selected {% endif %}>100</option>
                                     </select>&nbsp;&nbsp;条
                                 </div>
                                 <div class="col-sm-3" style="text-align: left;">

jimvc/themes/default/templates/guests_show.html

@@ -1864,7 +1864,6 @@
                                 <div class="col-sm-3" style="font-size: 12px; padding-top: 5px; text-align: right;">
                                     共有{{ paging.total }}条，每页显示：
                                     <select id="page_size" name="datatable-row-highlight_length" title="page_size" class="form-control" style="height: 22px; vertical-align: baseline;">
-                                        <option value="10" {% if page_size == 10 %} selected {% endif %}>10</option>
                                         <option value="20" {% if page_size == 20 %} selected {% endif %}>20</option>
                                         <option value="50" {% if page_size == 50  %} selected {% endif %}>50</option>
                                         <option value="100" {% if page_size == 100  %} selected {% endif %}>100</option>