bug fix & new feature

web/controller/group.py

@@ -8,6 +8,10 @@
 from web.service import group_service
 from frame.config import UIC_ADDRESS
 
+@app.route('/group/list')
+def group_list_get():
+    groups = HostGroup.all_groups_dict()
+    return jsonify(msg='',data=groups)
 
 @app.route('/group/create', methods=['POST'])
 def group_create_post():
@@ -91,4 +95,4 @@ def group_bind_template_get():
         return jsonify(msg="grp id is blank")
 
     GrpTpl.bind(grp_id, tpl_id, g.user_name)
-    return jsonify(msg='')
+    return jsonify(msg='')

web/controller/host.py

@@ -56,7 +56,9 @@ def group_hosts_list(group_id):
 def host_remove_post():
     group_id = int(request.form['grp_id'].strip())
     host_ids = request.form['host_ids'].strip()
-    GroupHost.unbind(group_id, host_ids)
+    hostid_arr = host_ids.splitlines()
+    for hid in hostid_arr:
+        GroupHost.unbind(group_id, int(hid))
     return jsonify(msg='')
 
 
@@ -116,7 +118,6 @@ def host_add_post():
     failure = []
 
     for h in safe_host_arr:
-        h = h.strip()
         msg = GroupHost.bind(group_id, h)
         if not msg:
             success.append('%s<br>' % h)
@@ -169,4 +170,9 @@ def host_unbind_get():
         return jsonify(msg='group_id is blank')
 
     GroupHost.unbind(int(group_id), host_id)
-    return jsonify(msg='')
+    return jsonify(msg='')
+
+@app.route('/host/list')
+def host_list_get():
+    hosts=Host.all_host_dict()
+    return jsonify(msg='', data=hosts)

web/model/host_group.py

@@ -53,6 +53,11 @@ def all_group_dict(cls):
         rows = db.query_all('select id, grp_name from grp where come_from = 0')
         return [{'id': row[0], 'name': row[1]} for row in rows]
 
+    @classmethod
+    def all_groups_dict(cls):
+        rows = db.query_all('select id, grp_name, create_user from grp')
+        return [{'id': row[0], 'name': row[1], 'create_user': row[2]} for row in rows]
+
     @classmethod
     def all_set(cls):
         sql = 'select id, grp_name from %s' % cls._tbl
@@ -63,4 +68,4 @@ def all_set(cls):
             name = row[1]
             name_set[name] = set(name.split('_'))
             name_id[name] = row[0]
-        return name_set, name_id
+        return name_set, name_id