From 9de2ff2052f75421e000486fd085c4e4076f606d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B3=E4=B9=A6=E5=83=AE?= <wangjun5@kingsoft.com>
Date: Mon, 27 Mar 2017 07:58:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Didc=5Flist=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=B6=E9=87=8D=E6=96=B0=E5=8A=A0=E8=BD=BDtable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/assets/asset_group_create.html  |   4 +-
 .../templates/assets/asset_group_detail.html  |  36 ----
 apps/assets/templates/assets/asset_list.html  | 202 +++++++++---------
 apps/assets/templates/assets/idc_list.html    |  55 ++---
 4 files changed, 131 insertions(+), 166 deletions(-)

diff --git a/apps/assets/templates/assets/asset_group_create.html b/apps/assets/templates/assets/asset_group_create.html
index 49654bb8a..41f0d3e2f 100644
--- a/apps/assets/templates/assets/asset_group_create.html
+++ b/apps/assets/templates/assets/asset_group_create.html
@@ -51,8 +51,8 @@
                                                 </div>
                                             </div>
                                         <div class="hr-line-dashed"></div>
-                                        <h3 class="widget-head-color-box">资产用户</h3>
-                                        {{ form.system_users|bootstrap_horizontal }}
+{#                                        <h3 class="widget-head-color-box">资产用户</h3>#}
+{#                                        {{ form.system_users|bootstrap_horizontal }}#}
                                         <div class="form-group">
                                             <div class="col-sm-4 col-sm-offset-5">
                                                 <button class="btn btn-white" type="reset"> 重置 </button>
diff --git a/apps/assets/templates/assets/asset_group_detail.html b/apps/assets/templates/assets/asset_group_detail.html
index 2dc09ab41..26162f4e0 100644
--- a/apps/assets/templates/assets/asset_group_detail.html
+++ b/apps/assets/templates/assets/asset_group_detail.html
@@ -101,42 +101,6 @@
                                 </div>
                             </div>
 
-                            <div class="panel panel-info">
-                                <div class="panel-heading">
-                                    <i class="fa fa-info-circle"></i> {% trans 'Associate system user' %}
-                                </div>
-                                <div class="panel-body">
-                                    <table class="table system-user-table">
-                                        <tbody>
-                                        <form>
-                                            <tr class="no-borders-tr">
-                                                <td colspan="2">
-                                                    <select data-placeholder="{% trans 'Select system user' %}" class="select2" style="width: 100%" multiple="" tabindex="4">
-                                                        {% for system_user in system_users_remain %}
-                                                            <option value="{{ system_user.id }}" id="opt_{{ system_user.id }}">{{ system_user.name }}</option>
-                                                        {% endfor %}
-                                                    </select>
-                                                </td>
-                                            </tr>
-                                            <tr class="no-borders-tr">
-                                                <td colspan="2">
-                                                    <button type="button" class="btn btn-info btn-sm btn-asset-add-groups-system-users">{% trans 'Associate' %}</button>
-                                                </td>
-                                            </tr>
-                                        </form>
-                                        {% for system_user in system_users %}
-                                        <tr>
-                                            <td ><b class="bdg_system_user" data-sid={{ system_user.id }}>{{ system_user.name }}</b></td>
-                                            <td>
-                                                <button class="btn btn-danger btn-xs pull-right btn_leave_asset_group" type="button" style="float: right;"><i class="fa fa-minus"></i></button>
-                                            </td>
-                                        </tr>
-                                        {% endfor %}
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-
                         </div>
                     </div>
                 </div>
diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html
index d12462cab..38c6a9c0a 100644
--- a/apps/assets/templates/assets/asset_list.html
+++ b/apps/assets/templates/assets/asset_list.html
@@ -71,7 +71,7 @@
             <option value="delete">{% trans 'Delete selected' %}</option>
             <option value="update">{% trans 'Update selected' %}</option>
             <option value="deactive">{% trans 'Deactive selected' %}</option>
-	        <option value="active">{% trans 'Active' %}</option>
+            <option value="active">{% trans 'Active' %}</option>
         </select>
         <div class="input-group-btn pull-left" style="padding-left: 5px;">
             <button id='btn_bulk_update' style="height: 32px;"  class="btn btn-sm btn-primary">
@@ -96,12 +96,12 @@ window.onload = function (){
     };
 
 function tagShow() {
-	var oDiv = document.getElementById("ydxbd");
-	if (oDiv.style.display == 'none'){
-		oDiv.style.display = "block";
-	}else{
-		oDiv.style.display = "none";
-	}
+    var oDiv = document.getElementById("ydxbd");
+    if (oDiv.style.display == 'none'){
+        oDiv.style.display = "block";
+    }else{
+        oDiv.style.display = "none";
+    }
 }  //onload;
 
 function objDelete(obj, name, url) {
@@ -137,98 +137,98 @@ function objDelete(obj, name, url) {
 }
 
 $(document).ready(function(){
-	var options = {
-		ele: $('#asset_list_table'),
-		columnDefs: [
-			{targets: 1, createdCell: function (td, cellData, rowData) {
-				var detail_btn = '<a href="{% url "assets:asset-detail" pk=99991937 %}">' + cellData + '</a>';
-				$(td).html(detail_btn.replace('99991937', rowData.id));
-			}},
-			{targets: 7, createdCell: function (td, cellData) {
-				if (!cellData) {
-					$(td).html('<i class="fa fa-times text-danger"></i>')
-				} else {
-					$(td).html('<i class="fa fa-check text-navy"></i>')
-				}
-			}},
-			{targets: 8, createdCell: function (td, cellData) {
-				if (!cellData) {
-					$(td).html('<i class="fa fa-circle text-danger"></i>')
-				} else {
-					$(td).html('<i class="fa fa-circle text-navy"></i>')
-				}
-			}},
-			{targets: 9, createdCell: function (td, cellData, rowData) {
-				var update_btn = '<a href="{% url "assets:asset-update" pk=99991937 %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'.replace('99991937', cellData);
-				var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn_asset_delete" data-uid="99991937">{% trans "Delete" %}</a>'.replace('99991937', cellData);
-				$(td).html(update_btn + del_btn)
-			}}
-		],
-		ajax_url: '{% url "api-assets:asset-list" %}',
-		columns: [{data: "id"}, {data: "hostname" }, {data: "ip" }, {data: "port" },
-			{data: "get_type_display" }, {data: "get_env_display"}, {data: "hardware"},
-			{data: "is_active" }, {data: "is_active"}, {data: "id" }],
-		op_html: $('#actions').html()
-	};
-	var table = jumpserver.initDataTable(options);
-	$('.btn_export').click(function () {
-		var assets = [];
-		var rows = table.rows('.selected').data();
-		$.each(rows, function (index, obj) {
-			assets.push(obj.id)
-		});
-		console.log(assets);
-		$.ajax({
-			url: "{% url "assets:asset-export" %}",
-			method: 'POST',
-			data: JSON.stringify({assets_id: assets}),
-			dataType: "json",
-			success: function (data, textStatus) {
-				window.open(data.redirect)
-			},
-			error: function () {
-				toastr.error('Export failed');
-			}
-		})
-	});
- 	$('#btn_asset_import').click(function() {
-		var $form = $('#fm_asset_import');
-		$form.find('.help-block').remove();
-		function success (data) {
-			if (data.valid === false) {
-				$('<span />', {class: 'help-block text-danger'}).html(data.msg).insertAfter($('#id_assets'));
-			} else {
-				$('#id_created').html(data.created_info);
-				$('#id_created_detail').html(data.created.join(', '));
-				$('#id_updated').html(data.updated_info);
-				$('#id_updated_detail').html(data.updated.join(', '));
-				$('#id_failed').html(data.failed_info);
-				$('#id_failed_detail').html(data.failed.join(', '));
-				var $data_table = $('#asset_list_table').DataTable();
-				$data_table.ajax.reload();
-			}
-		}
-		$form.ajaxSubmit({success: success});
-	})
+    var options = {
+        ele: $('#asset_list_table'),
+        columnDefs: [
+            {targets: 1, createdCell: function (td, cellData, rowData) {
+                var detail_btn = '<a href="{% url "assets:asset-detail" pk=99991937 %}">' + cellData + '</a>';
+                $(td).html(detail_btn.replace('99991937', rowData.id));
+            }},
+            {targets: 7, createdCell: function (td, cellData) {
+                if (!cellData) {
+                    $(td).html('<i class="fa fa-times text-danger"></i>')
+                } else {
+                    $(td).html('<i class="fa fa-check text-navy"></i>')
+                }
+            }},
+            {targets: 8, createdCell: function (td, cellData) {
+                if (!cellData) {
+                    $(td).html('<i class="fa fa-circle text-danger"></i>')
+                } else {
+                    $(td).html('<i class="fa fa-circle text-navy"></i>')
+                }
+            }},
+            {targets: 9, createdCell: function (td, cellData, rowData) {
+                var update_btn = '<a href="{% url "assets:asset-update" pk=99991937 %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'.replace('99991937', cellData);
+                var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn_asset_delete" data-uid="99991937">{% trans "Delete" %}</a>'.replace('99991937', cellData);
+                $(td).html(update_btn + del_btn)
+            }}
+        ],
+        ajax_url: '{% url "api-assets:asset-list" %}',
+        columns: [{data: "id"}, {data: "hostname" }, {data: "ip" }, {data: "port" },
+            {data: "get_type_display" }, {data: "get_env_display"}, {data: "hardware"},
+            {data: "is_active" }, {data: "is_active"}, {data: "id" }],
+        op_html: $('#actions').html()
+    };
+    var table = jumpserver.initDataTable(options);
+    $('.btn_export').click(function () {
+        var assets = [];
+        var rows = table.rows('.selected').data();
+        $.each(rows, function (index, obj) {
+            assets.push(obj.id)
+        });
+        console.log(assets);
+        $.ajax({
+            url: "{% url "assets:asset-export" %}",
+            method: 'POST',
+            data: JSON.stringify({assets_id: assets}),
+            dataType: "json",
+            success: function (data, textStatus) {
+                window.open(data.redirect)
+            },
+            error: function () {
+                toastr.error('Export failed');
+            }
+        })
+    });
+     $('#btn_asset_import').click(function() {
+        var $form = $('#fm_asset_import');
+        $form.find('.help-block').remove();
+        function success (data) {
+            if (data.valid === false) {
+                $('<span />', {class: 'help-block text-danger'}).html(data.msg).insertAfter($('#id_assets'));
+            } else {
+                $('#id_created').html(data.created_info);
+                $('#id_created_detail').html(data.created.join(', '));
+                $('#id_updated').html(data.updated_info);
+                $('#id_updated_detail').html(data.updated.join(', '));
+                $('#id_failed').html(data.failed_info);
+                $('#id_failed_detail').html(data.failed.join(', '));
+                var $data_table = $('#asset_list_table').DataTable();
+                $data_table.ajax.reload();
+            }
+        }
+        $form.ajaxSubmit({success: success});
+    })
 })
 
 .on('click', '.btn_asset_delete', function () {
-	var $this = $(this);
-	var $data_table = $("#asset_list_table").DataTable();
-	var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
-	var uid = $this.data('uid');
-	var the_url = '{% url "api-assets:asset-detail" pk=99991937 %}'.replace('99991937', uid);
-	console.log(the_url);
-	objDelete($this, name, the_url);
-	setTimeout( function () {
+    var $this = $(this);
+    var $data_table = $("#asset_list_table").DataTable();
+    var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
+    var uid = $this.data('uid');
+    var the_url = '{% url "api-assets:asset-detail" pk=99991937 %}'.replace('99991937', uid);
+    console.log(the_url);
+    objDelete($this, name, the_url);
+    setTimeout( function () {
         $data_table.ajax.reload();
     }, 3000);
 })
 
 .on('click', '#btn_bulk_update', function () {
-	var action = $('#slct_bulk_update').val();
-	var $data_table = $('#asset_list_table').DataTable();
-	var id_list = [];
+    var action = $('#slct_bulk_update').val();
+    var $data_table = $('#asset_list_table').DataTable();
+    var id_list = [];
     var plain_id_list = [];
     $data_table.rows({selected: true}).every(function(){
         id_list.push({id: this.data().id});
@@ -301,8 +301,8 @@ $(document).ready(function(){
 })
 
 .on('click', '#btn_asset_bulk_update', function () {
-	var json_data = $("#fm_asset_bulk_update").serializeObject();
-	var body = {};
+    var json_data = $("#fm_asset_bulk_update").serializeObject();
+    var body = {};
     body.enable_otp = (json_data.enable_otp === 'on')? true: false;
     if (json_data.type != '') {
         body.type = json_data.type;
@@ -318,23 +318,23 @@ $(document).ready(function(){
     }
 
     if (json_data.system_users != undefined) {
-    	body.system_users = json_data.system_users;
+        body.system_users = json_data.system_users;
     }
     if (typeof body.system_users === 'string') {
-    	body.system_users = [parseInt(body.system_users)]
+        body.system_users = [parseInt(body.system_users)]
     } else if(typeof body.system_users === 'array') {
-    	var new_users = body.system_users.map(Number);
-    	body.system_users = new_users;
+        var new_users = body.system_users.map(Number);
+        body.system_users = new_users;
     }
 
     if (json_data.tags != undefined) {
-    	body.tags = json_data.tags;
+        body.tags = json_data.tags;
     }
     if (typeof body.tags == 'string') {
-    	body.tags = [parseInt(body.tags)];
+        body.tags = [parseInt(body.tags)];
     } else if (typeof body.tags === 'array') {
-    	var new_tags = body.tags.map(Number);
-    	body.tags = new_tags;
+        var new_tags = body.tags.map(Number);
+        body.tags = new_tags;
     }
 
     var $data_table = $('#asset_list_table').DataTable();
diff --git a/apps/assets/templates/assets/idc_list.html b/apps/assets/templates/assets/idc_list.html
index a3471adc8..a19d5d99e 100644
--- a/apps/assets/templates/assets/idc_list.html
+++ b/apps/assets/templates/assets/idc_list.html
@@ -27,16 +27,16 @@
     </tbody>
 </table>
 <div id="actions" class="hide">
-	<div class="input-group">
-		<select class="form-control m-b" style="width: auto" id="slct_bulk_update">
-			<option value="delete">{% trans 'Delete selected' %}</option>
-		</select>
-		<div class="input-group-btn pull-left" style="padding-left: 5px;">
-			<button id='btn_bulk_update' style="height: 32px;"  class="btn btn-sm btn-primary">
-				{% trans 'Submit' %}
-			</button>
-		</div>
-	</div>
+    <div class="input-group">
+        <select class="form-control m-b" style="width: auto" id="slct_bulk_update">
+            <option value="delete">{% trans 'Delete selected' %}</option>
+        </select>
+        <div class="input-group-btn pull-left" style="padding-left: 5px;">
+            <button id='btn_bulk_update' style="height: 32px;"  class="btn btn-sm btn-primary">
+                {% trans 'Submit' %}
+            </button>
+        </div>
+    </div>
 </div>
 {% endblock %}
 {% block content_bottom_left %}{% endblock %}
@@ -65,19 +65,20 @@ $(document).ready(function(){
 })
 
 .on('click', '.btn_idc_delete', function () {
-	var $this = $(this);
-	var $data_table = $('#idc_list_table').DataTable();
-	var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
-	var uid = $this.data('uid');
-	var the_url = '{% url "api-assets:idc-detail" pk=99991937 %}'.replace('99991937', uid);
-	objectDelete($this, name, the_url);
-	$data_table.ajax.reload();
-{#	TODO: reload the tale #}
+    var $this = $(this);
+    var $data_table = $('#idc_list_table').DataTable();
+    var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
+    var uid = $this.data('uid');
+    var the_url = '{% url "api-assets:idc-detail" pk=99991937 %}'.replace('99991937', uid);
+    objectDelete($this, name, the_url);
+    setTimeout( function () {
+        $data_table.ajax.reload();
+    }, 3000);
 })
 
 .on('click', '#btn_bulk_update', function () {
-	var action = $('#slct_bulk_update').val();
-	var $data_table = $('#idc_list_table').DataTable();
+    var action = $('#slct_bulk_update').val();
+    var $data_table = $('#idc_list_table').DataTable();
     var id_list = [];
     var plain_id_list = [];
     $data_table.rows({selected: true}).every(function(){
@@ -113,13 +114,13 @@ $(document).ready(function(){
             jumpserver.checked = false;
         });
     }
-	switch (action) {
-		case 'delete':
-			doDelete();
-			break;
-		default:
-			break;
-	}
+    switch (action) {
+        case 'delete':
+            doDelete();
+            break;
+        default:
+            break;
+    }
 });
 </script>
 {% endblock %}