diff --git a/views/list-management/index.tpl b/views/list-management/index.tpl index ce220695..5a08a032 100644 --- a/views/list-management/index.tpl +++ b/views/list-management/index.tpl @@ -54,7 +54,7 @@ 'contentOptions' => ['class' => 'text-center'], 'headerOptions' => ['class' => 'text-center'] ], - [ + [ 'attribute' => 'type', 'contentOptions' => ['class' => 'text-center'], 'headerOptions' => ['class' => 'text-center'], @@ -97,6 +97,13 @@ 'contentOptions' => ['class' => 'text-center'], 'headerOptions' => ['class' => 'text-center'] ] + ], + 'pager' => [ + 'firstPageLabel' => "", + 'lastPageLabel' => "", + 'nextPageLabel' => "", + 'prevPageLabel' => "", + 'maxButtonCount' => 5 ] ])} diff --git a/web/js/list-management.js b/web/js/list-management.js index fc8ca813..f40f58dd 100644 --- a/web/js/list-management.js +++ b/web/js/list-management.js @@ -361,14 +361,12 @@ function _sync() { } common.modalBlock(true); $("#progress-totals").html(lists.length); - $("#progress-form").removeClass("hidden"); + $("#progress-form").removeClass("hidden"); totals = lists.length; - for (var i = 0; i < lists.length; i++) { - syncFeatureFromDevice(lists[i]); - } + syncFeatureFromDevice(lists[0], lists); } -function syncFeatureFromDevice(id) { +function syncFeatureFromDevice(id, fullData) { $.ajax({ url: $("input[name='sync_feature_from_device_url']").val(), type: 'POST', @@ -377,6 +375,7 @@ function syncFeatureFromDevice(id) { ip: $("input[name='SyncIP']").val() }, success: function (data) { + console.log(data, progress); progress++; $("#progress-current").html(parseInt($("#progress-current").html()) + 1); var percent = parseInt(progress / totals * 100); @@ -387,6 +386,8 @@ function syncFeatureFromDevice(id) { common.modalBlock(false); updateFeature(); progress = 0; + } else { + syncFeatureFromDevice(fullData[progress], fullData); } }, error: function (jqXHR, textStatus, errorThrown) {