Skip to content

J
jumpserver
Commit 9de2ff20 authored by 右书僮's avatar 右书僮
Browse files
Options

修复idc_list删除时重新加载table

parent e0179ea3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 65 deletions
apps/assets/templates/assets/asset_group_create.html
View file @ 9de2ff20
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
</div> </div>
</div> </div>
<div class="hr-line-dashed"></div> <div class="hr-line-dashed"></div>
<h3 class="widget-head-color-box">资产用户</h3> {# <h3 class="widget-head-color-box">资产用户</h3>#}
{{ form.system_users|bootstrap_horizontal }} {# {{ form.system_users|bootstrap_horizontal }}#}
<div class="form-group"> <div class="form-group">
<div class="col-sm-4 col-sm-offset-5"> <div class="col-sm-4 col-sm-offset-5">
<button class="btn btn-white" type="reset"> 重置 </button> <button class="btn btn-white" type="reset"> 重置 </button>
......
apps/assets/templates/assets/asset_group_detail.html
View file @ 9de2ff20
...@@ -101,42 +101,6 @@ ...@@ -101,42 +101,6 @@
</div> </div>
</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> </div>
</div> </div>
......
apps/assets/templates/assets/idc_list.html
View file @ 9de2ff20
...@@ -27,16 +27,16 @@ ...@@ -27,16 +27,16 @@
</tbody> </tbody>
</table> </table>
<div id="actions" class="hide"> <div id="actions" class="hide">
<div class="input-group"> <div class="input-group">
<select class="form-control m-b" style="width: auto" id="slct_bulk_update"> <select class="form-control m-b" style="width: auto" id="slct_bulk_update">
<option value="delete">{% trans 'Delete selected' %}</option> <option value="delete">{% trans 'Delete selected' %}</option>
</select> </select>
<div class="input-group-btn pull-left" style="padding-left: 5px;"> <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"> <button id='btn_bulk_update' style="height: 32px;" class="btn btn-sm btn-primary">
{% trans 'Submit' %} {% trans 'Submit' %}
</button> </button>
</div> </div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% block content_bottom_left %}{% endblock %} {% block content_bottom_left %}{% endblock %}
...@@ -65,19 +65,20 @@ $(document).ready(function(){ ...@@ -65,19 +65,20 @@ $(document).ready(function(){
}) })
.on('click', '.btn_idc_delete', function () { .on('click', '.btn_idc_delete', function () {
var $this = $(this); var $this = $(this);
var $data_table = $('#idc_list_table').DataTable(); var $data_table = $('#idc_list_table').DataTable();
var name = $(this).closest("tr").find(":nth-child(2)").children('a').html(); var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
var uid = $this.data('uid'); var uid = $this.data('uid');
var the_url = '{% url "api-assets:idc-detail" pk=99991937 %}'.replace('99991937', uid); var the_url = '{% url "api-assets:idc-detail" pk=99991937 %}'.replace('99991937', uid);
objectDelete($this, name, the_url); objectDelete($this, name, the_url);
$data_table.ajax.reload(); setTimeout( function () {
{# TODO: reload the tale #} $data_table.ajax.reload();
}, 3000);
}) })
.on('click', '#btn_bulk_update', function () { .on('click', '#btn_bulk_update', function () {
var action = $('#slct_bulk_update').val(); var action = $('#slct_bulk_update').val();
var $data_table = $('#idc_list_table').DataTable(); var $data_table = $('#idc_list_table').DataTable();
var id_list = []; var id_list = [];
var plain_id_list = []; var plain_id_list = [];
$data_table.rows({selected: true}).every(function(){ $data_table.rows({selected: true}).every(function(){
...@@ -113,13 +114,13 @@ $(document).ready(function(){ ...@@ -113,13 +114,13 @@ $(document).ready(function(){
jumpserver.checked = false; jumpserver.checked = false;
}); });
} }
switch (action) { switch (action) {
case 'delete': case 'delete':
doDelete(); doDelete();
break; break;
default: default:
break; break;
} }
}); });
</script> </script>
{% endblock %} {% endblock %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment