You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/11/03 09:13:21 UTC
[1/3] qpid-broker-j git commit: QPID-8010:[Broker-J][WMC] Make
selection of grid rows on Virtual Host tab consistent with other grids
Repository: qpid-broker-j
Updated Branches:
refs/heads/master d22f7a574 -> c5fd43289
QPID-8010:[Broker-J][WMC] Make selection of grid rows on Virtual Host tab consistent with other grids
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/c5fd4328
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/c5fd4328
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/c5fd4328
Branch: refs/heads/master
Commit: c5fd4328917776c3537533a3b7f34273520e2ca7
Parents: 8bb393f
Author: Alex Rudyy <or...@apache.org>
Authored: Thu Nov 2 22:28:42 2017 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Fri Nov 3 09:13:11 2017 +0000
----------------------------------------------------------------------
.../src/main/java/resources/js/qpid/management/VirtualHost.js | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/c5fd4328/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
index 5cae427..11fc134 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
@@ -280,7 +280,7 @@ define(["dojo/parser",
category: "Queue",
selectClause: "id, name, type, consumerCount, queueDepthMessages, queueDepthBytes",
orderBy: "name",
- selectionMode: 'multiple',
+ selectionMode: 'none',
deselectOnRefresh: false,
allowSelectAll: true,
columns: [
@@ -323,7 +323,7 @@ define(["dojo/parser",
category: "Exchange",
selectClause: "id, name, type, bindingCount",
orderBy: "name",
- selectionMode: 'multiple',
+ selectionMode: 'none',
deselectOnRefresh: false,
allowSelectAll: true,
allowSelect: function (row)
@@ -355,6 +355,7 @@ define(["dojo/parser",
this.connectionsGrid = new QueryGrid({
detectChanges: true,
rowsPerPage: 10,
+ selectionMode: 'none',
transformer: lang.hitch(this, this._transformConnectionData),
management: this.management,
parentObject: this.modelObj,
@@ -403,7 +404,7 @@ define(["dojo/parser",
category: "VirtualHostLogger",
selectClause: "id, name, type, errorCount, warnCount",
orderBy: "name",
- selectionMode: 'multiple',
+ selectionMode: 'none',
deselectOnRefresh: false,
allowSelectAll: true,
columns: [
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] qpid-broker-j git commit: QPID-8009:[Broker-J][WMC] Clear grid
selection on invoking operations to move/delete/clear messages
Posted by or...@apache.org.
QPID-8009:[Broker-J][WMC] Clear grid selection on invoking operations to move/delete/clear messages
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/10d49a71
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/10d49a71
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/10d49a71
Branch: refs/heads/master
Commit: 10d49a71d39bdfb02dbc984521a027bf01c96862
Parents: d22f7a5
Author: Alex Rudyy <or...@apache.org>
Authored: Thu Nov 2 21:33:56 2017 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Fri Nov 3 09:13:11 2017 +0000
----------------------------------------------------------------------
.../java/resources/js/qpid/management/Queue.js | 26 ++++++++++++++------
1 file changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/10d49a71/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
index 35d24dd..2bbc4ec 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
@@ -269,11 +269,14 @@ define(["dojo/_base/declare",
var parameters = {messageIds: []};
for (var i = 0; i < data.length; i++)
{
- parameters.messageIds.push(data[i].id);
+ if (data[i])
+ {
+ parameters.messageIds.push(data[i].id);
+ }
}
this.management.update(modelObj, parameters)
- .then(lang.hitch(this, function (result)
+ .then(lang.hitch(this, function ()
{
this.grid.selection.deselectAll();
this.reloadGridData();
@@ -290,7 +293,11 @@ define(["dojo/_base/declare",
name: "clearQueue",
parent: this.modelObj
};
- this.management.update(modelObj, {}).then(lang.hitch(this, this.reloadGridData));
+ this.management.update(modelObj, {}).then(lang.hitch(this, function ()
+ {
+ this.grid.selection.deselectAll();
+ this.reloadGridData();
+ }));
}
};
Queue.prototype.refreshMessages = function ()
@@ -310,7 +317,6 @@ define(["dojo/_base/declare",
};
Queue.prototype.moveOrCopyMessages = function (obj)
{
- var that = this;
var move = obj.move;
var data = this.grid.selection.getSelected();
if (data.length)
@@ -322,15 +328,19 @@ define(["dojo/_base/declare",
}
for (i = 0; i < data.length; i++)
{
- putData.messages.push(data[i].id);
+ if (data[i])
+ {
+ putData.messages.push(data[i].id);
+ }
}
- moveMessages.show(that.management, that.modelObj, putData, function ()
+ moveMessages.show(this.management, this.modelObj, putData, lang.hitch(this, function ()
{
if (move)
{
- that.reloadGridData();
+ this.grid.selection.deselectAll();
+ this.reloadGridData();
}
- });
+ }));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] qpid-broker-j git commit: QPID-8007:[Broker-J][WMC] Remove
calls to ready on loading of query and dashboard creation forms
Posted by or...@apache.org.
QPID-8007:[Broker-J][WMC] Remove calls to ready on loading of query and dashboard creation forms
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/8bb393f5
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/8bb393f5
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/8bb393f5
Branch: refs/heads/master
Commit: 8bb393f5ad2bd22feb025fc4a651e2ce4cfe6dac
Parents: 10d49a7
Author: Alex Rudyy <or...@apache.org>
Authored: Thu Nov 2 21:35:48 2017 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Fri Nov 3 09:13:11 2017 +0000
----------------------------------------------------------------------
.../resources/js/qpid/common/ConsoleHelper.js | 86 +++++++++-----------
1 file changed, 40 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/8bb393f5/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
index 75af5f1..deace04 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
@@ -86,33 +86,30 @@ define(["dojo/query",
{
var management = this.management;
var controller = this.controller;
- if (queryCreateDialog == null)
+ if (queryCreateDialog === null)
{
- require(["qpid/management/query/QueryCreateDialogForm", "dojo/ready"],
- function (QueryCreateDialogForm, ready)
+ require(["qpid/management/query/QueryCreateDialogForm"],
+ function (QueryCreateDialogForm)
{
- ready(function ()
+ queryCreateDialogForm =
+ new QueryCreateDialogForm({management: management, structure: controller.structure});
+ queryCreateDialogForm.on("create", function (e)
{
- queryCreateDialogForm =
- new QueryCreateDialogForm({management: management, structure: controller.structure});
- queryCreateDialogForm.on("create", function (e)
- {
- queryCreateDialog.hide();
- var tabData = {
- tabType: "query",
- modelObject: e.parentObject,
- data: e.preference,
- preferenceId: e.preference.id
- };
- controller.showTab(tabData);
- });
- queryCreateDialogForm.on("cancel", function (e)
- {
- queryCreateDialog.hide();
- });
- queryCreateDialog = new Dialog({title: "Create query", content: queryCreateDialogForm});
- queryCreateDialog.show();
+ queryCreateDialog.hide();
+ var tabData = {
+ tabType: "query",
+ modelObject: e.parentObject,
+ data: e.preference,
+ preferenceId: e.preference.id
+ };
+ controller.showTab(tabData);
});
+ queryCreateDialogForm.on("cancel", function (e)
+ {
+ queryCreateDialog.hide();
+ });
+ queryCreateDialog = new Dialog({title: "Create query", content: queryCreateDialogForm});
+ queryCreateDialog.show();
});
}
else
@@ -131,33 +128,30 @@ define(["dojo/query",
{
var management = this.management;
var controller = this.controller;
- if (dashboardCreateDialog == null)
+ if (dashboardCreateDialog === null)
{
- require(["qpid/management/dashboard/DashboardCreateDialogForm", "dojo/ready"],
- function (DashboardCreateDialogForm, ready)
+ require(["qpid/management/dashboard/DashboardCreateDialogForm"],
+ function (DashboardCreateDialogForm)
{
- ready(function ()
+ dashboardCreateDialogForm =
+ new DashboardCreateDialogForm({management: management, structure: controller.structure});
+ dashboardCreateDialogForm.on("create", function (e)
+ {
+ dashboardCreateDialog.hide();
+ var tabData = {
+ tabType: "dashboard",
+ modelObject: e.parentObject,
+ data: e.preference,
+ preferenceId: e.preference.id
+ };
+ controller.showTab(tabData);
+ });
+ dashboardCreateDialogForm.on("cancel", function (e)
{
- dashboardCreateDialogForm =
- new DashboardCreateDialogForm({management: management, structure: controller.structure});
- dashboardCreateDialogForm.on("create", function (e)
- {
- dashboardCreateDialog.hide();
- var tabData = {
- tabType: "dashboard",
- modelObject: e.parentObject,
- data: e.preference,
- preferenceId: e.preference.id
- };
- controller.showTab(tabData);
- });
- dashboardCreateDialogForm.on("cancel", function (e)
- {
- dashboardCreateDialog.hide();
- });
- dashboardCreateDialog = new Dialog({title: "Create dashboard", content: dashboardCreateDialogForm});
- dashboardCreateDialog.show();
+ dashboardCreateDialog.hide();
});
+ dashboardCreateDialog = new Dialog({title: "Create dashboard", content: dashboardCreateDialogForm});
+ dashboardCreateDialog.show();
});
}
else
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org