fix some files

2017-03-24 10:37:05 +08:00 · 2017-03-24 10:37:05 +08:00 · c5666f1357
parent 3f72ce4b1f
commit c5666f1357
4 changed files with 52 additions and 60 deletions
--- a/apps/assets/templates/assets/asset_group_create.html
+++ b/apps/assets/templates/assets/asset_group_create.html
@ -99,7 +99,6 @@
        keyboard: 'false',
        remote:"{% url 'assets:asset-modal-list' %}?group_id={{ group_id }}"
    });
-
    $('#modal').on('show.bs.modal',function(){
        //alert('当调用show方法时，立即触发；')
    });
--- a/apps/assets/templates/assets/asset_modal_list.html
+++ b/apps/assets/templates/assets/asset_modal_list.html
@ -14,26 +14,22 @@
                <th id="th_no">id</th>
                <th>资产名称</th>
                <th>IP</th>
-                <th>硬件类型</th>
-                <th>资产组</th>
-                <th>部门</th>
+                <th>类型</th>
            </tr>
        </thead>
        <tbody>
        {% for asset in asset_modal_list %}
            {% if asset.id in all_assets %}
-            <tr name="oAssets" class="odd selected">
-                <td class="text-center" ><input type="checkbox" name="checked" value="{{ asset.id }}" checked="checked" ></td>
+            <tr name="oAssets" class="odd selected text-center">
+                <td class="text-center" ><input type="checkbox" name="checked" value="{{ asset.id }}" checked="checked"></td>
            {% else %}
            <tr name="oAssets">
-                <td class="text-center" ><input type="checkbox" name="checked" value="{{ asset.id }}" ></td>
+                <td class="text-center"><input type="checkbox" name="checked" value="{{ asset.id }}" ></td>
            {% endif %}
                <td>{{ asset.id }}</td>
                <td>{{ asset.hostname }}</td>
                <td>{{ asset.ip }}</td>
-                <td>虚拟机</td>
-                <td>网络设备</td>
-                <td>微信事业部</td>
+                <td>{{ asset.env }}-{{ asset.type }}</td>
            </tr>
        {% endfor %}
        </tbody>
@ -61,9 +57,7 @@ $(document).ready(function(){
            {data: "id"},
            {data: "hostname"},
            {data: "ip"},
-            {data: "type"},
-            {data: "group"},
-            {data: "dp"}
+            {data: "type"}
        ]
    });
    //将ID列隐藏
@ -77,18 +71,18 @@ $(document).ready(function(){
        }else{
            $(this).addClass('selected');
            this.children[0].children[0].checked=1;
-        };
+        }
    });

    $('#close-btn').on('click',function(){
        $('#modal').modal('hide');
    });
-    var size_name = document.getElementById('asset_on_count').innerText
+    var size_name = document.getElementById('asset_on_count').innerText;
    $('#save-btn').on('click',function(){
        //alert( table.rows('.selected').data().length +' row(s) selected' );
        var d = table.rows('.selected').data();
        var size = d.length;
-        var re = /\d+/
+        var re = /\d+/;
        document.getElementById('add_asset').value = size;
        var str= size_name;
        var re=/\d+/g;
@ -109,25 +103,25 @@ $(document).ready(function(){

 }); //$(document).ready

-    var bCheck = 1;
-    function checkAll(){
-        if(bCheck){
-            $("tr[name='oAssets']").each(function(){
-                oCheckbox = this.children[0].children[0];
-                $(this).toggleClass('selected',true);
-                oCheckbox.checked=1;
-            });
-            document.getElementById('check_all').checked=1;
-            bCheck = 0;
-        }else{
-            $("tr[name='oAssets']").each(function(){
-                oCheckbox = this.children[0].children[0];
-                $(this).toggleClass('selected',false);
-                oCheckbox.checked=0;
-            });
-            document.getElementById('check_all').checked=0;
-            bCheck = 1;
-        };
-    };
+var bCheck = 1;
+function checkAll(){
+    if(bCheck){
+        $("tr[name='oAssets']").each(function(){
+            oCheckbox = this.children[0].children[0];
+            $(this).toggleClass('selected',true);
+            oCheckbox.checked=1;
+        });
+        document.getElementById('check_all').checked=1;
+        bCheck = 0;
+    }else{
+        $("tr[name='oAssets']").each(function(){
+            oCheckbox = this.children[0].children[0];
+            $(this).toggleClass('selected',false);
+            oCheckbox.checked=0;
+        });
+        document.getElementById('check_all').checked=0;
+        bCheck = 1;
+    }
+}

 </script>
--- a/apps/assets/templates/assets/asset_modal_update.html
+++ b/apps/assets/templates/assets/asset_modal_update.html
@ -43,11 +43,10 @@
        </div>
    </form>
 <div class="hr-line-dashed"></div>
-
-                      <div class="ydxbd" id="formlists" style="display: block;">
-                          <p id="tags_p" class="mgl-5 c02">选择需要修改属性</p>
-                           <div class="tagBtnList">
-                                           <a onclick="AddAllForm(this)" class="tagBtn2 label label-primary" id="changeall">全选</a>
+    <div class="ydxbd" id="formlists" style="display: block;">
+        <p id="tags_p" class="mgl-5 c02">选择需要修改属性</p>
+        <div class="tagBtnList">
+            <a onclick="AddAllForm(this)" class="tagBtn2 label label-primary" id="changeall">全选</a>
            <a onclick="AddForm(this,'id_port')" class="tagBtn2 label label-default" name="changebtn">端口</a>
            <a onclick="AddForm(this,'id_type')" class="tagBtn2 label label-default" name="changebtn">系统类型</a>
            <a onclick="AddForm(this,'id_idc')" class="tagBtn2 label label-default" name="changebtn">机房</a>
@ -65,9 +64,8 @@
            <a onclick="AddForm(this,'id_env')" class="tagBtn2 label label-default" name="changebtn">资产环境</a>
            <a onclick="AddForm(this,'id_tags')" class="tagBtn2 label label-default" name="changebtn">标签</a>
            <a onclick="AddForm(this,'id_comment')" class="tagBtn2 label label-default" name="changebtn">备注</a>
-                           </div>
-                       </div>
-
+        </div>
+    </div>
    <input name="assets_ids" type="hidden" value="111" >
    <input name="assets_ids" type="hidden" value="112" >
 <div class="hr-line-dashed"></div>
@ -130,15 +128,15 @@
        $('.select2').select2();
        $("#id_tags").select2({
        tags: true,
-        maximumSelectionLength: 8,  //最多能够选择的个数
+        maximumSelectionLength: 8  //最多能够选择的个数
        //closeOnSelect: false
        });
-    };
+    }
    function AddForm(obj,id_form) {
        var oHiddenForms = document.getElementById("ridd");
        var parentElem = document.getElementById("add_form");
        var oH = document.getElementById(id_form);
-        var oNew = oH.parentNode.parentNode
+        var oNew = oH.parentNode.parentNode;
        var aDiv = parentElem.getElementsByClassName('form-group');
            if(oNew.parentNode.id=='ridd') {
                obj.className="tagBtn2 label label-warning";
@ -148,15 +146,15 @@
                oHiddenForms.appendChild(oNew);
                obj.className="tagBtn2 label label-default";
                SetSelect2();
-            };
-    };
+            }
+    }

    function ChangeBtnCss(class_var){
-        var changebtns = $("#formlists").find("a[name='changebtn']")
+        var changebtns = $("#formlists").find("a[name='changebtn']");
        for (var i=0; i<changebtns.length;i++){
            changebtns[i].className=class_var;
-        };
-    };
+        }
+    }
    function AddAllForm(obj) {
        var oHiddenForms = document.getElementById("ridd");
        var parentElem = document.getElementById("add_form");
@ -167,18 +165,18 @@
        if(oHidden_len == 0 || obj.innerText == "取消全选"){
            for(var i=0;i<aDiv_len-1;i++){
                oHiddenForms.appendChild(aDiv[0]);
-            };
+            }
            ChangeBtnCss("tagBtn2 label label-default");
            $('#changeall').text("全选");
        }else{
            for(var i=0;i<oHidden_len;i++){
                parentElem.insertBefore(oHiddenForms.children[0],bFormBtn);
-            };
+            }
            ChangeBtnCss("tagBtn2 label label-warning");
            $('#changeall').text("取消全选");
            SetSelect2();
-        };
-    };
+        }
+    }


    function fsubmit(){
@ -202,11 +200,11 @@
            for(var i=0;i<m.length;i++){
                alert(m[0].value);
                oForm.appendChild(m[0]);
-            };
+            }
            action="/assets/asset/"+assets_id[0].value+"/update";
            oForm.action=action;
            oForm.submit();
-        };
+        }
    }
 </script>
 {% endblock %}
--- a/apps/assets/views.py
+++ b/apps/assets/views.py
@ -206,7 +206,7 @@ class AssetModalListView(AdminUserRequiredMixin, ListView):
            else:
                plain_id_lists = [int(self.s)]
            context = {
-                'all_assets' :plain_id_lists
+                'all_assets': plain_id_lists
            }
            kwargs.update(context)
        if group_id:
@ -304,7 +304,8 @@ class AssetGroupUpdateView(AdminUserRequiredMixin, UpdateView):
            'action': _('Create asset group'),
            'assets_on_list': assets_all,
            'assets_count': len(assets_all),
-            'group_id':self.object.id,
+            'group_id': self.object.id,
+            'tags': Tag.objects.all()
        }
        kwargs.update(context)
        return super(AssetGroupUpdateView, self).get_context_data(**kwargs)