From ffb6dbc6f3afb7abff90a8d0f2e60ba2a7c3d19e Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 25 Apr 2018 15:28:01 +0200
Subject: [PATCH] datatables: use new way of generating labels for count of
 dynamic datatables.

- according to docs this is a better way. We'll use this in other places with some added changes.
---
 .../permissions/permissions_ssh_keys.mako     | 27 ++++++--------
 rhodecode/templates/forks/forks.mako          | 35 ++++++-------------
 2 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/rhodecode/templates/admin/permissions/permissions_ssh_keys.mako b/rhodecode/templates/admin/permissions/permissions_ssh_keys.mako
index 349c487b..6035e3ac 100644
--- a/rhodecode/templates/admin/permissions/permissions_ssh_keys.mako
+++ b/rhodecode/templates/admin/permissions/permissions_ssh_keys.mako
@@ -22,21 +22,21 @@
 $(document).ready(function() {
     var $sshKeyListTable = $('#ssh_keys_table');
 
-    var getDatatableCount = function(){
-      var table = $sshKeyListTable.dataTable();
-      var page = table.api().page.info();
-      var  active = page.recordsDisplay;
-      var  total = page.recordsTotal;
-
-      var _text = _gettext("{0} out of {1} ssh keys").format(active, total);
-      $('#ssh_keys_count').text(_text);
-    };
-
     // user list
     $sshKeyListTable.DataTable({
       processing: true,
       serverSide: true,
-      ajax: "${h.route_path('admin_permissions_ssh_keys_data')}",
+      ajax: {
+          "url": "${h.route_path('admin_permissions_ssh_keys_data')}",
+          "dataSrc": function ( json ) {
+              var filteredCount = json.recordsFiltered;
+              var total = json.recordsTotal;
+
+              var _text = _gettext("{0} out of {1} ssh keys").format(filteredCount, total);
+              $('#ssh_keys_count').text(_text);
+              return json.data;
+          }
+      },
       dom: 'rtp',
       pageLength: ${c.visual.admin_grid_items},
       order: [[ 0, "asc" ]],
@@ -75,11 +75,6 @@ $(document).ready(function() {
         $sshKeyListTable.css('opacity', 0.3);
     });
 
-    // refresh counters on draw
-    $sshKeyListTable.on('draw.dt', function(){
-        getDatatableCount();
-    });
-
     // filter
     $('#q_filter').on('keyup',
         $.debounce(250, function() {
diff --git a/rhodecode/templates/forks/forks.mako b/rhodecode/templates/forks/forks.mako
index c74f3dd8..efd604f0 100644
--- a/rhodecode/templates/forks/forks.mako
+++ b/rhodecode/templates/forks/forks.mako
@@ -43,23 +43,15 @@
 <script type="text/javascript">
 
 $(document).ready(function() {
-    var $userListTable = $('#fork_list_table');
+    var $forksListTable = $('#fork_list_table');
 
-    var getDatatableCount = function(){
-      var table = $userListTable.dataTable();
-      var page = table.api().page.info();
-      var  active = page.recordsDisplay;
-      var  total = page.recordsTotal;
-
-      var _text = _gettext("{0} out of {1} users").format(active, total);
-      $('#user_count').text(_text);
-    };
-
-    // user list
-    $userListTable.DataTable({
+    // fork list
+    $forksListTable.DataTable({
       processing: true,
       serverSide: true,
-      ajax: "${h.route_path('repo_forks_data', repo_name=c.repo_name)}",
+      ajax: {
+          "url": "${h.route_path('repo_forks_data', repo_name=c.repo_name)}",
+      },
       dom: 'rtp',
       pageLength: ${c.visual.dashboard_items},
       order: [[ 0, "asc" ]],
@@ -92,23 +84,18 @@ $(document).ready(function() {
       }
     });
 
-    $userListTable.on('xhr.dt', function(e, settings, json, xhr){
-        $userListTable.css('opacity', 1);
+    $forksListTable.on('xhr.dt', function(e, settings, json, xhr){
+        $forksListTable.css('opacity', 1);
     });
 
-    $userListTable.on('preXhr.dt', function(e, settings, data){
-        $userListTable.css('opacity', 0.3);
-    });
-
-    // refresh counters on draw
-    $userListTable.on('draw.dt', function(){
-        getDatatableCount();
+    $forksListTable.on('preXhr.dt', function(e, settings, data){
+        $forksListTable.css('opacity', 0.3);
     });
 
     // filter
     $('#q_filter').on('keyup',
         $.debounce(250, function() {
-            $userListTable.DataTable().search(
+            $forksListTable.DataTable().search(
                 $('#q_filter').val()
             ).draw();
         })