accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmil...@apache.org
Subject [accumulo] branch master updated: ACCUMULO-4771 Fix datatables paging in Monitor
Date Thu, 18 Jan 2018 22:28:26 GMT
This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new c134e65  ACCUMULO-4771 Fix datatables paging in Monitor
c134e65 is described below

commit c134e65542b0557baa0ad36e0e5a6fbb4b97d8a3
Author: Mike Miller <mmiller@apache.org>
AuthorDate: Thu Jan 18 17:13:32 2018 -0500

    ACCUMULO-4771 Fix datatables paging in Monitor
---
 .../main/resources/org/apache/accumulo/monitor/resources/js/server.js   | 2 +-
 .../main/resources/org/apache/accumulo/monitor/resources/js/tservers.js | 2 +-
 .../src/main/resources/org/apache/accumulo/monitor/templates/log.ftl    | 2 +-
 .../src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/server.js
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/server.js
index bc58b52..474a271 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/server.js
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/server.js
@@ -194,5 +194,5 @@ function refreshCurrentTable() {
  * Generates the server results table
  */
 function refreshResultsTable() {
-  tabletResults.ajax.reload();
+  tabletResults.ajax.reload(null, false ); // user paging is not reset on reload
 }
\ No newline at end of file
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/tservers.js
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/tservers.js
index 247f3cf..817db9f 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/tservers.js
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/tservers.js
@@ -167,5 +167,5 @@ function clearDeadTServers(server) {
  * Generates the tserver table
  */
 function refreshTServersTable() {
-  if(tserversList) tserversList.ajax.reload();
+  if(tserversList) tserversList.ajax.reload(null, false ); // user paging is not reset on
reload
 }
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/log.ftl
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/log.ftl
index 19b355b..4645d0b 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/log.ftl
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/log.ftl
@@ -54,7 +54,7 @@
          * Used to refresh the table
          */
         function refresh() {
-          logList.ajax.reload();
+          logList.ajax.reload(null, false ); // user paging is not reset on reload
         }
       </script>
       <div><h3>${title}</h3></div>
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
index 8d3a9a2..3cd45db 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
@@ -73,7 +73,7 @@
             refreshMaster();
           </#if>
 
-          tableList.ajax.reload();
+          tableList.ajax.reload(null, false ); // user paging is not reset on reload
         }
       </script>
       <div><h3>${tablesTitle}</h3></div>

-- 
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <commits@accumulo.apache.org>'].

Mime
View raw message