From d1e4d340c4955b8af446d0f430d3bb06c7b5a43d Mon Sep 17 00:00:00 2001 From: PhantomVl Date: Wed, 11 Oct 2017 20:07:22 +0300 Subject: [PATCH] Prerelease 11.10.2017 fix in js --- assets/js/sccp_manager.js | 10 ++++++++-- views/advserver.model.php | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/assets/js/sccp_manager.js b/assets/js/sccp_manager.js index d66a5f1..8750a9e 100644 --- a/assets/js/sccp_manager.js +++ b/assets/js/sccp_manager.js @@ -408,9 +408,10 @@ $(document).ready(function () { } if (($(this).data('id') === 'model_enabled') || ($(this).data('id') === 'model_disabled')) { var dev_cmd = $(this).data('id'); + var tab_name ='#'+$(this).data('table'); var datas = ''; var i = 0; - $('table').bootstrapTable('getSelections').forEach(function (entry) { + $(tab_name).bootstrapTable('getSelections').forEach(function (entry) { datas = datas + 'model[' + i + ']=' + entry['model'] + '&'; i++; }); @@ -512,7 +513,9 @@ $("table").on('check.bs.table', function (e, row) { }); $("table").on('uncheck.bs.table', function (e, row) { var id_fld = $(this).data('id'); - var id_count = $("table").bootstrapTable('getAllSelections').length; + var id_parent = '#'+$(this).parent().find('table').attr('id'); +// console.log(id_parent); + var id_count = $(id_parent).bootstrapTable('getAllSelections').length; if (id_count < 1) { $(".btn-tab-select").each(function () { $(this).attr('disabled', true); @@ -522,6 +525,9 @@ $("table").on('uncheck.bs.table', function (e, row) { }); $("table").on('uncheck-all.bs.table', function (rows) { var id_fld = $(this).data('id'); + var id_parent = '#'+$(this).parent().find('table').attr('id'); +// console.log(id_parent); +// var id_count = $(id_parent).bootstrapTable('getAllSelections').length; var id_count = $("table").bootstrapTable('getAllSelections').length; if (id_count < 1) { $(".btn-tab-select").each(function () { diff --git a/views/advserver.model.php b/views/advserver.model.php index 4cb916f..75bad43 100644 --- a/views/advserver.model.php +++ b/views/advserver.model.php @@ -14,10 +14,10 @@
- -