You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by mi...@apache.org on 2018/01/23 21:58:31 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1580 Browsing in hawtio
console does not allow to show empty pages
Repository: activemq-artemis
Updated Branches:
refs/heads/master 434841b14 -> 314a9d546
ARTEMIS-1580 Browsing in hawtio console does not allow to show empty pages
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/06d27b40
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/06d27b40
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/06d27b40
Branch: refs/heads/master
Commit: 06d27b4045529bdd92fb395d1f7cc7a523a2b04a
Parents: 434841b
Author: Stanislav Knot <sk...@redhat.com>
Authored: Tue Jan 9 17:17:49 2018 +0100
Committer: Michael Pearce <mi...@me.com>
Committed: Tue Jan 23 21:58:14 2018 +0000
----------------------------------------------------------------------
.../artemis-plugin/src/main/webapp/plugin/js/addresses.js | 3 +++
.../artemis-plugin/src/main/webapp/plugin/js/connections.js | 3 +++
.../artemis-plugin/src/main/webapp/plugin/js/consumers.js | 3 +++
.../artemis-plugin/src/main/webapp/plugin/js/producers.js | 3 +++
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queues.js | 3 +++
.../artemis-plugin/src/main/webapp/plugin/js/sessions.js | 3 +++
6 files changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/06d27b40/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/addresses.js
----------------------------------------------------------------------
diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/addresses.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/addresses.js
index ea196ac..c321acb 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/addresses.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/addresses.js
@@ -186,6 +186,9 @@ var ARTEMIS = (function(ARTEMIS) {
if (parseInt(newVal.currentPage) && newVal !== oldVal && newVal.currentPage !== oldVal.currentPage) {
$scope.loadTable();
}
+ if (parseInt(newVal.pageSize) && newVal !== oldVal && newVal.pageSize !== oldVal.pageSize) {
+ $scope.pagingOptions.currentPage = 1;
+ }
}, true);
function getBrokerMBean(jolokia) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/06d27b40/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/connections.js
----------------------------------------------------------------------
diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/connections.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/connections.js
index b6041c2..a63d581 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/connections.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/connections.js
@@ -223,6 +223,9 @@ var ARTEMIS = (function(ARTEMIS) {
if (parseInt(newVal.currentPage) && newVal !== oldVal && newVal.currentPage !== oldVal.currentPage) {
$scope.loadTable();
}
+ if (parseInt(newVal.pageSize) && newVal !== oldVal && newVal.pageSize !== oldVal.pageSize) {
+ $scope.pagingOptions.currentPage = 1;
+ }
}, true);
function getBrokerMBean(jolokia) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/06d27b40/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/consumers.js
----------------------------------------------------------------------
diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/consumers.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/consumers.js
index c0e27a2..8273676 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/consumers.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/consumers.js
@@ -247,6 +247,9 @@ var ARTEMIS = (function(ARTEMIS) {
if (parseInt(newVal.currentPage) && newVal !== oldVal && newVal.currentPage !== oldVal.currentPage) {
$scope.loadTable();
}
+ if (parseInt(newVal.pageSize) && newVal !== oldVal && newVal.pageSize !== oldVal.pageSize) {
+ $scope.pagingOptions.currentPage = 1;
+ }
}, true);
function getBrokerMBean(jolokia) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/06d27b40/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/producers.js
----------------------------------------------------------------------
diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/producers.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/producers.js
index 33f8e3e..4f30376 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/producers.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/producers.js
@@ -212,6 +212,9 @@ var ARTEMIS = (function(ARTEMIS) {
if (parseInt(newVal.currentPage) && newVal !== oldVal && newVal.currentPage !== oldVal.currentPage) {
$scope.loadTable();
}
+ if (parseInt(newVal.pageSize) && newVal !== oldVal && newVal.pageSize !== oldVal.pageSize) {
+ $scope.pagingOptions.currentPage = 1;
+ }
}, true);
function getBrokerMBean(jolokia) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/06d27b40/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queues.js
----------------------------------------------------------------------
diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queues.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queues.js
index 241e0d7..204b12d 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queues.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queues.js
@@ -286,6 +286,9 @@ var ARTEMIS = (function(ARTEMIS) {
if (parseInt(newVal.currentPage) && newVal !== oldVal && newVal.currentPage !== oldVal.currentPage) {
$scope.loadTable();
}
+ if (parseInt(newVal.pageSize) && newVal !== oldVal && newVal.pageSize !== oldVal.pageSize) {
+ $scope.pagingOptions.currentPage = 1;
+ }
}, true);
function getBrokerMBean(jolokia) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/06d27b40/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/sessions.js
----------------------------------------------------------------------
diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/sessions.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/sessions.js
index 20aa752..199f1d6 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/sessions.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/sessions.js
@@ -242,6 +242,9 @@ var ARTEMIS = (function(ARTEMIS) {
if (parseInt(newVal.currentPage) && newVal !== oldVal && newVal.currentPage !== oldVal.currentPage) {
$scope.loadTable();
}
+ if (parseInt(newVal.pageSize) && newVal !== oldVal && newVal.pageSize !== oldVal.pageSize) {
+ $scope.pagingOptions.currentPage = 1;
+ }
}, true);
function getBrokerMBean(jolokia) {
[2/2] activemq-artemis git commit: This closes #1762
Posted by mi...@apache.org.
This closes #1762
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/314a9d54
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/314a9d54
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/314a9d54
Branch: refs/heads/master
Commit: 314a9d546591dae020e47bd2d462a68d316257cd
Parents: 434841b 06d27b4
Author: Michael Pearce <mi...@me.com>
Authored: Tue Jan 23 21:58:21 2018 +0000
Committer: Michael Pearce <mi...@me.com>
Committed: Tue Jan 23 21:58:21 2018 +0000
----------------------------------------------------------------------
.../artemis-plugin/src/main/webapp/plugin/js/addresses.js | 3 +++
.../artemis-plugin/src/main/webapp/plugin/js/connections.js | 3 +++
.../artemis-plugin/src/main/webapp/plugin/js/consumers.js | 3 +++
.../artemis-plugin/src/main/webapp/plugin/js/producers.js | 3 +++
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queues.js | 3 +++
.../artemis-plugin/src/main/webapp/plugin/js/sessions.js | 3 +++
6 files changed, 18 insertions(+)
----------------------------------------------------------------------