Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver

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>

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>

apps/assets/templates/assets/asset_list.html

@@ -183,10 +183,15 @@ $(document).ready(function(){
 
 .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);
-	objectDelete($this, name, the_url);
+    console.log(the_url);
+    objDelete($this, name, the_url);
+    setTimeout( function () {
+        $data_table.ajax.reload();
+    }, 3000);
 })
 
 .on('click', '#btn_bulk_update', function () {

apps/assets/templates/assets/idc_list.html

@@ -71,8 +71,9 @@ $(document).ready(function(){
     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();
-{#	TODO: reload the tale #}
+    }, 3000);
 })
 
 .on('click', '#btn_bulk_update', function () {