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 2016/06/17 09:06:04 UTC
svn commit: r1748817 - in
/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources: ./
css/ images/ js/qpid/management/query/ query/
Author: orudyy
Date: Fri Jun 17 09:06:04 2016
New Revision: 1748817
URL: http://svn.apache.org/viewvc?rev=1748817&view=rev
Log:
QPID-7308: Improve Query UI functionality and look
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/images/notification.svg
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/DropDownSelect.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryBuilder.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryGrid.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryStore.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/query/QueryBuilder.html
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css?rev=1748817&r1=1748816&r2=1748817&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css Fri Jun 17 09:06:04 2016
@@ -437,23 +437,33 @@ div .messages {
.advancedSearchItem
{
- width:100%;
- margin-left:0px;
- margin-right:0px;
- padding: 2px;
+ width: 100%;
+ margin: 0px;
+ padding: 2px 0px 2px 0px;
+ vertical-align: middle;
}
-.advancedSearchLabel
+.searchLabel
{
float: left;
- padding: 0px 4px 0px 4px;
+ text-align: right;
+ vertical-align: middle;
+ padding: 0.2em;
+ min-width: 3.5em;
}
.advancedSearchField
{
overflow: hidden;
}
+.claro .advancedSearchField .dijitTextArea,
.advancedSearchField textarea
{
- height: 1.2em;
+ height: 1.6em;
+ width: 100%;
+ padding: 0px;
+ box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
}
.criteriaCondition
{
@@ -509,3 +519,17 @@ div .messages {
padding-top: 5px;
padding-bottom: 5px;
}
+
+.claro.qpid .dgrid-pagination .dgrid-page-link {
+ color: #5D88AF;
+ font-weight: normal;
+}
+
+.claro.qpid .dgrid-pagination .dgrid-page-disabled {
+ color: black;
+ font-weight: normal;
+}
+
+.claro.qpid .dgrid-hider-toggle {
+ background-position: -32px -192px;
+}
\ No newline at end of file
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/images/notification.svg
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/images/notification.svg?rev=1748817&r1=1748816&r2=1748817&view=diff
==============================================================================
Binary files - no diff available.
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html?rev=1748817&r1=1748816&r2=1748817&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html Fri Jun 17 09:06:04 2016
@@ -20,17 +20,18 @@
<meta charset="utf-8">
<title>Qpid Management</title>
<link rel="icon" type="image/png" href="images/qpid-favicon.png" />
- <link rel="stylesheet" href="dojo/dojo/resources/dojo.css">
- <link rel="stylesheet" href="dojo/dijit/themes/claro/claro.css">
- <link rel="stylesheet" href="dojo/dojox/grid/resources/claroGrid.css">
- <link rel="stylesheet" href="dojo/dojox/grid/enhanced/resources/claro/EnhancedGrid.css">
- <link rel="stylesheet" href="dojo/dojox/grid/enhanced/resources/EnhancedGrid_rtl.css">
- <link rel="stylesheet" href="dojo/dojox/form/resources/CheckedMultiSelect.css">
+ <link rel="stylesheet" href="dojo/dojo/resources/dojo.css"/>
+ <link rel="stylesheet" href="dojo/dijit/themes/claro/claro.css"/>
+ <link rel="stylesheet" href="dojo/dojox/grid/resources/claroGrid.css"/>
+ <link rel="stylesheet" href="dojo/dojox/grid/enhanced/resources/claro/EnhancedGrid.css"/>
+ <link rel="stylesheet" href="dojo/dojox/grid/enhanced/resources/EnhancedGrid_rtl.css"/>
+ <link rel="stylesheet" href="dojo/dojox/form/resources/CheckedMultiSelect.css"/>
<link rel="stylesheet" href="dojo/dojox/form/resources/FileInput.css" />
- <link rel="stylesheet" href="dojo/dijit/themes/claro/document.css">
- <link rel="stylesheet" href="dojo/dgrid/css/dgrid.css">
- <link rel="stylesheet" href="dojo/dgrid/css/skins/claro.css">
- <link rel="stylesheet" href="css/common.css" media="screen">
+ <link rel="stylesheet" href="dojo/dijit/themes/claro/document.css"/>
+ <link rel="stylesheet" href="dojo/dgrid/css/dgrid.css"/>
+ <link rel="stylesheet" href="dojo/dgrid/css/skins/claro.css"/>
+ <link rel="stylesheet" href="dojo/dojo/resources/dnd.css"/>
+ <link rel="stylesheet" href="css/common.css" media="screen"/>
<script>
function getContextPath()
{
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/DropDownSelect.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/DropDownSelect.js?rev=1748817&r1=1748816&r2=1748817&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/DropDownSelect.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/DropDownSelect.js Fri Jun 17 09:06:04 2016
@@ -126,6 +126,7 @@ define(["dojo/_base/declare",
_optionsGrid: null,
_descending: false,
_selectedItems: [],
+ _selectedIds: {},
postCreate: function ()
{
@@ -184,7 +185,13 @@ define(["dojo/_base/declare",
{
for (var i = 0; i < event.rows.length; ++i)
{
- this._selectedItems.push(event.rows[i].data);
+ var item = event.rows[i].data;
+ var id = item[this.idProperty];
+ if (!this._selectedIds[id])
+ {
+ this._selectedItems.push(item);
+ this._selectedIds[id] = true;
+ }
}
this._selectionChanged();
},
@@ -195,9 +202,10 @@ define(["dojo/_base/declare",
var id = event.rows[i].id;
for (var j = 0; j < this._selectedItems.length; ++j)
{
- if (this._selectedItems[j].id === id)
+ if (this._selectedItems[j][this.idProperty] === id)
{
this._selectedItems.splice(j, 1);
+ delete this._selectedIds[id];
break;
}
}
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryBuilder.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryBuilder.js?rev=1748817&r1=1748816&r2=1748817&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryBuilder.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryBuilder.js Fri Jun 17 09:06:04 2016
@@ -30,7 +30,8 @@ define(["dojo/_base/declare",
"dgrid/Selection",
"dgrid/extensions/Pagination",
"dgrid/Selector",
- "dgrid/extensions/ColumnResizer",
+ "dgrid/extensions/ColumnReorder",
+ "dgrid/extensions/ColumnHider",
"dstore/Memory",
'dstore/legacy/DstoreAdapter',
"qpid/management/query/QueryGrid",
@@ -69,7 +70,8 @@ define(["dojo/_base/declare",
Selection,
Pagination,
Selector,
- ColumnResizer,
+ ColumnReorder,
+ ColumnHider,
Memory,
DstoreAdapter,
QueryGrid)
@@ -168,6 +170,10 @@ define(["dojo/_base/declare",
this._resultsGrid.setParentObject(this._scopeModelObjects[scope]);
this._resultsGrid.refresh();
},
+ getDefaultColumns: function(category)
+ {
+ return ["id", "name"];
+ },
_showModeSwitchWarningIfRequired: function ()
{
var userPreferences = this.management.userPreferences;
@@ -178,9 +184,10 @@ define(["dojo/_base/declare",
{
if (!this._switchModeWarningDialog)
{
- var formattedMessage = "<div>Switching to advanced mode is a one-way street,<br/>"
- + "switching back from advanced mode to standard mode will<br/>"
- + "completely reset the query.</div>";
+ var formattedMessage = "<div>Copying of query settings is only supported on switching from Standard view into Advanced view!<br/>"
+ + "Switching back from Advanced view into Standard view will completely reset the query.<br/><br/>"
+ + "Are you sure you want to switch from Standard view into Advanced view?"
+ "</div>";
this._switchModeWarningDialog = new qpid.management.query.MessageDialog({
title: "Warning!",
message: formattedMessage
@@ -228,7 +235,6 @@ define(["dojo/_base/declare",
_advancedModeOrderByChanged: function ()
{
this._resultsGrid.setOrderBy(this.advancedOrderBy.value);
- this._resultsGrid.setSort([]);
},
_toggleSearchButton: function (select)
{
@@ -278,15 +284,68 @@ define(["dojo/_base/declare",
}
this._resultsGrid.setSort(newSort);
},
- _standardModeSelectChanged: function (selectedColumns)
+ _processStandardModeSelectChange : function (selectedColumns)
{
this._normalizeSorting(selectedColumns);
var selectClause = this._buildSelectExpression(selectedColumns);
this._setSelectClause(selectClause);
this._lastStandardModeSelect = lang.clone(selectedColumns);
this._toggleSearchButton(selectClause);
+ },
+ _standardModeSelectChanged: function (selectedColumns)
+ {
+ this._processStandardModeSelectChange(selectedColumns);
this.search();
},
+ _standardModeColumnOrderChanged: function(event)
+ {
+ if (this._standardMode)
+ {
+ var columnRow = event.subRow;
+ var selectedItems = this.standardSelectChooser.get("selectedItems");
+ var newSelectedItems = [];
+ for(var i = 0; i < columnRow.length; i++)
+ {
+ var field = parseInt(columnRow[i].field) - 1;
+ newSelectedItems.push(selectedItems[field]);
+ }
+ this._processStandardModeSelectChange(newSelectedItems);
+ this.standardSelectChooser.set("data", {"selected": newSelectedItems});
+ }
+ else
+ {
+ event.preventDefault();
+ event.stopPropagation();
+ }
+ },
+ _standardModeColumnStateChanged: function(event)
+ {
+ if (event.hidden)
+ {
+ var checkNode = null;
+ if (this._resultsGrid._columnHiderCheckboxes && this._resultsGrid._columnHiderCheckboxes[event.column.id])
+ {
+ checkNode = this._resultsGrid._columnHiderCheckboxes[event.column.id].parentNode;
+ checkNode.style.display = 'none';
+ }
+ try
+ {
+ var columnIndex = parseInt(event.column.field) - 1;
+ var newSelectedItems = this.standardSelectChooser.get("selectedItems");
+ newSelectedItems.splice(columnIndex, 1);
+ this._processStandardModeSelectChange(newSelectedItems);
+ this.standardSelectChooser.set("data", {"selected": newSelectedItems});
+ this._resultsGrid.refresh();
+ }
+ finally
+ {
+ if (checkNode)
+ {
+ checkNode.style.display = '';
+ }
+ }
+ }
+ },
_standardModeWhereChanged: function (result)
{
this._resultsGrid.setWhere(result);
@@ -294,7 +353,7 @@ define(["dojo/_base/declare",
},
_buildGrid: function ()
{
- var grid = new QueryGrid({
+ var grid = new (declare([QueryGrid,ColumnReorder,ColumnHider]))({
controller: this.controller,
management: this.management,
category: this._categorySelector.value.toLowerCase(),
@@ -331,6 +390,9 @@ define(["dojo/_base/declare",
{
this.advancedOrderBy.set("value", event.orderBy);
}));
+ grid.on('dgrid-columnreorder', lang.hitch(this, this._standardModeColumnOrderChanged));
+ grid.on('dgrid-columnstatechange', lang.hitch(this, this._standardModeColumnStateChanged))
+ grid.hiderToggleNode.title = "Remove columns";
this._resultsGrid = grid;
this._resultsGrid.startup();
},
@@ -345,6 +407,7 @@ define(["dojo/_base/declare",
{
this._lastHeaders = headers;
this._resultsGrid.setUseCachedResults(true);
+ this._resultsGrid.hiderToggleNode.style.display = this._standardMode && headers.length > 0 ? '' : 'none';
this._resultsGrid.set("columns", this._getColumns(headers));
this._resultsGrid.resize();
}
@@ -375,7 +438,9 @@ define(["dojo/_base/declare",
var column = {
label: attribute,
field: "" + (i + 1),
- sortable: true
+ sortable: true,
+ reorderable: !!this._standardMode,
+ unhidable: !this._standardMode
};
columns.push(column);
if (this._columns)
@@ -535,42 +600,59 @@ define(["dojo/_base/declare",
},
_categoryChanged: function (value)
{
- this._resetSearch();
var metadata = this._getCategoryMetadata(value);
- var disableMetadataDependant = !metadata;
- this.standardWhereChooser.set("disabled", disableMetadataDependant);
- this.standardSelectChooser.set("disabled", disableMetadataDependant);
- this.searchButton.set("disabled", true);
- this.modeButton.set("disabled", disableMetadataDependant);
- this.advancedSelect.set("disabled", disableMetadataDependant);
- this.advancedWhere.set("disabled", disableMetadataDependant);
- this.advancedOrderBy.set("disabled", disableMetadataDependant);
- this._resultsGrid.setCategory(value);
-
- if (disableMetadataDependant)
+ var columns, items, selectedItems;
+ if (!metadata)
{
dijit.showTooltip(this._categorySelector.get("invalidMessage"),
this._categorySelector.domNode,
this._categorySelector.get("tooltipPosition"),
!this._categorySelector.isLeftToRight());
+ columns = {};
+ items = [];
+ selectedItems = [];
}
else
{
var data = this._combineTypeAttributesAndStatistics(metadata);
- this._columns = data.asObject;
- this.standardSelectChooser.set("data", {
- items: data.asArray,
- idProperty: "id",
- selected: [],
- nameProperty: "attributeName"
- });
- this.standardWhereChooser.set("data", {
- items: data.asArray,
- selected: [],
- idProperty: "id",
- nameProperty: "attributeName"
- });
+ columns = data.asObject;
+ items = data.asArray;
+ selectedItems = this.getDefaultColumns(value);
}
+
+ this.standardSelectChooser.set("data", {
+ items: items,
+ idProperty: "id",
+ selected: selectedItems,
+ nameProperty: "attributeName"
+ });
+ this.standardWhereChooser.set("data", {
+ items: items,
+ selected: [],
+ idProperty: "id",
+ nameProperty: "attributeName"
+ });
+ this.standardWhereExpressionBuilder.clearWhereCriteria();
+ this.advancedWhere.set("value", "");
+ this.advancedOrderBy.set("value", "");
+ this._columns = columns;
+ this._lastStandardModeSelect = this.standardSelectChooser.get("selectedItems");
+ var select = this._buildSelectExpression(this._lastStandardModeSelect);
+ this.advancedSelect.set("value", select);
+ this._setSelectClause(select);
+ this._resultsGrid.setWhere("");
+ this._resultsGrid.setOrderBy("");
+ this._resultsGrid.setSort([]);
+ this._resultsGrid.setCategory(value);
+ var disableMetadataDependant = !metadata;
+ this.standardWhereChooser.set("disabled", disableMetadataDependant);
+ this.standardSelectChooser.set("disabled", disableMetadataDependant);
+ this.modeButton.set("disabled", disableMetadataDependant);
+ this.advancedSelect.set("disabled", disableMetadataDependant);
+ this.advancedWhere.set("disabled", disableMetadataDependant);
+ this.advancedOrderBy.set("disabled", disableMetadataDependant);
+ this.searchButton.set("disabled", disableMetadataDependant);
+ this.search();
},
_advancedModeKeyPressed: function (evt)
{
@@ -582,7 +664,6 @@ define(["dojo/_base/declare",
this._setSelectClause(this.advancedSelect.value);
this._resultsGrid.setWhere(this.advancedWhere.value);
this._resultsGrid.setOrderBy(this.advancedOrderBy.value);
- this._resultsGrid.setSort([]);
this.search();
}
},
@@ -602,6 +683,16 @@ define(["dojo/_base/declare",
this._buildSelectExpression(this.standardSelectChooser.get("selectedItems")));
this.advancedWhere.set("value", this._resultsGrid.getWhere());
this.advancedOrderBy.set("value", this._resultsGrid.getOrderBy());
+
+ this._resultsGrid.hiderToggleNode.style.display = 'none';
+
+ // rebuild columns to disable column reordering and removal
+ if (this._lastHeaders && this._lastHeaders.length)
+ {
+ this._resultsGrid.setUseCachedResults(true);
+ this._resultsGrid.set("columns", this._getColumns(this._lastHeaders));
+ this._resultsGrid.resize();
+ }
}
else
{
@@ -612,19 +703,23 @@ define(["dojo/_base/declare",
this.standardSearch.style.display = "";
this.standardWhereExpressionBuilder.domNode.style.display = "";
this.advancedSearch.style.display = "none";
- this._resetSearch();
+ var category = this._categorySelector.value;
+ var selectedItems = this.getDefaultColumns(category);
+ this.standardSelectChooser.set("data", {selected: selectedItems});
+ this.standardWhereChooser.set("data", {selected: []});
+ this.standardWhereExpressionBuilder.clearWhereCriteria();
+ this._lastStandardModeSelect = this.standardSelectChooser.get("selectedItems");
+ this._lastHeaders = [];
+ var select = this._buildSelectExpression(this._lastStandardModeSelect);
+ this._setSelectClause(select);
+ this._resultsGrid.setWhere("");
+ this._resultsGrid.setOrderBy("");
+ this._resultsGrid.setSort([]);
+ this._toggleSearchButton(select);
+ this._resultsGrid.hiderToggleNode.style.display = '';
+ this.search();
}
},
- _resetSearch: function ()
- {
- this._resultsGrid.resetQuery();
- this.standardSelectChooser.set("data", {selected: []});
- this.standardWhereExpressionBuilder.clearWhereCriteria();
- this.advancedSelect.set("value", "");
- this.advancedWhere.set("value", "");
- this.advancedOrderBy.set("value", "");
- this.search();
- },
_getCategoryMetadata: function (value)
{
if (value)
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryGrid.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryGrid.js?rev=1748817&r1=1748816&r2=1748817&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryGrid.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryGrid.js Fri Jun 17 09:06:04 2016
@@ -31,7 +31,7 @@ define(["dojo/_base/declare",
"dgrid/extensions/Pagination",
"dgrid/extensions/ColumnResizer",
"qpid/management/query/QueryStore",
- "qpid/management/query/MessageDialog"],
+ "dojo/keys"],
function (declare,
lang,
domConstruct,
@@ -44,7 +44,8 @@ define(["dojo/_base/declare",
Selection,
Pagination,
ColumnResizer,
- QueryStore)
+ QueryStore,
+ keys)
{
var QueryGrid = declare("qpid.management.query.QueryGrid",
[Grid, Keyboard, Selection, Pagination, ColumnResizer],
@@ -63,7 +64,7 @@ define(["dojo/_base/declare",
collection: this._store,
rowsPerPage: 100,
selectionMode: 'single',
- cellNavigation: false,
+ cellNavigation: true,
className: 'dgrid-autoheight',
pageSizeOptions: [10, 20, 30, 40, 50, 100, 1000],
adjustLastColumn: true
@@ -75,6 +76,14 @@ define(["dojo/_base/declare",
{
this.inherited(arguments);
this.on('.dgrid-row:dblclick', lang.hitch(this, this._onRowClick));
+ this.on('.dgrid-row:keypress', lang.hitch(this, function (event)
+ {
+ if (event.keyCode === keys.ENTER)
+ {
+ this._onRowClick(event);
+ }
+ }));
+
this.on('dgrid-sort', lang.hitch(this, function (event)
{
for (var i = 0; i < this._sort.length; ++i)
@@ -87,9 +96,6 @@ define(["dojo/_base/declare",
}
this._sort.splice(0, 0, event.sort[0]);
this._updateOrderByExpression();
- event.preventDefault();
- event.stopPropagation();
- this.refresh();
}));
this.on('dgrid-refresh-complete', lang.hitch(this, function ()
{
@@ -131,6 +137,7 @@ define(["dojo/_base/declare",
setOrderBy: function (orderBy)
{
this._store.orderBy = orderBy;
+ this._sort = [];
},
setUseCachedResults: function (value)
{
@@ -139,23 +146,29 @@ define(["dojo/_base/declare",
setSort: function (value)
{
this._sort = lang.clone(value);
+ this._store.orderBy = this._buildOrderBy(this._sort);
},
getSort: function ()
{
return lang.clone(this._sort);
},
- _updateOrderByExpression: function ()
+ _buildOrderBy: function(sort)
{
var orderByExpression = "";
- if (this._sort && this._sort.length)
+ if (sort && sort.length)
{
var orders = [];
- for (var i = 0; i < this._sort.length; ++i)
+ for (var i = 0; i < sort.length; ++i)
{
- orders.push(parseInt(this._sort[i].property) + (this._sort[i].descending ? " desc" : ""));
+ orders.push(sort[i].property + (sort[i].descending ? " desc" : ""));
}
orderByExpression = orders.join(",");
}
+ return orderByExpression;
+ },
+ _updateOrderByExpression: function ()
+ {
+ var orderByExpression = this._buildOrderBy(this._sort);
this._store.orderBy = orderByExpression;
on.emit(this.domNode, "orderByChanged", {orderBy: orderByExpression});
},
@@ -206,13 +219,6 @@ define(["dojo/_base/declare",
this.controller.show(item.type, item.name, item.parent, item.id);
}
}));
- },
- resetQuery: function ()
- {
- this._store.where = "";
- this._store.selectClause = "";
- this._store.orderBy = "";
- this._sort = [];
}
});
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryStore.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryStore.js?rev=1748817&r1=1748816&r2=1748817&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryStore.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryStore.js Fri Jun 17 09:06:04 2016
@@ -130,7 +130,7 @@ define(['dojo/_base/lang',
}
}, function (error)
{
- if (error.status)
+ if (error && (!error.hasOwnProperty("response") || error.response.hasOwnProperty("status")))
{
this.management.errorHandler(error);
}
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/query/QueryBuilder.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/query/QueryBuilder.html?rev=1748817&r1=1748816&r2=1748817&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/query/QueryBuilder.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/query/QueryBuilder.html Fri Jun 17 09:06:04 2016
@@ -19,8 +19,14 @@
<div>
<div class="dijit queryToolBar">
- <label>Scope : <span data-dojo-attach-point="scope"></span></label>
- <label>Category : <span data-dojo-attach-point="categoryName"></span></label>
+ <div class="dijitInline">
+ <label class="searchLabel" for="queryScope_${id}">Scope: </label>
+ <span id="queryScope_${id}" data-dojo-attach-point="scope"></span>
+ </div>
+ <div class="dijitInline">
+ <label class="searchLabel" for="queryCategory_${id}">Category: </label>
+ <span id="queryCategory_${id}" data-dojo-attach-point="categoryName"></span>
+ </div>
<span data-dojo-attach-point="standardSearch">
<span data-dojo-type="qpid/management/query/DropDownSelect"
data-dojo-attach-point="standardSelectChooser"
@@ -44,11 +50,12 @@
data-dojo-type="qpid/management/query/WhereExpression" class="dijitToolbar"></div>
<div data-dojo-attach-point="advancedSearch" style="display:none;">
<div class="advancedSearchItem">
- <div class="advancedSearchLabel">Select :</div>
+ <label class="searchLabel" for="advancedSelect_${id}">Select: </label>
<div class="advancedSearchField">
- <textarea data-dojo-attach-point="advancedSelect" type="text"
- data-dojo-type="dijit/form/SimpleTextarea"
- data-dojo-props=" name: 'select',
+ <textarea id="advancedSelect_${id}"
+ data-dojo-attach-point="advancedSelect" type="text"
+ data-dojo-type="dijit/form/SimpleTextarea"
+ data-dojo-props=" name: 'select',
rows: 1,
intermediateChanges: true,
placeHolder: 'comma separated attribute names',
@@ -57,9 +64,10 @@
</div>
</div>
<div class="advancedSearchItem">
- <div class="advancedSearchLabel">Where : </div>
+ <label class="searchLabel" for="advancedWhere_${id}">Where: </label>
<div class="advancedSearchField" >
- <textarea data-dojo-attach-point="advancedWhere" type="text"
+ <textarea id="advancedWhere_${id}"
+ data-dojo-attach-point="advancedWhere" type="text"
data-dojo-type="dijit/form/SimpleTextarea"
data-dojo-props=" name: 'where',
rows: 1,
@@ -70,9 +78,10 @@
</div>
</div>
<div class="advancedSearchItem">
- <div class="advancedSearchLabel">Order : </div>
+ <label class="searchLabel" for="advancedOrderBy_${id}">Order: </label>
<div class="advancedSearchField" >
- <textarea data-dojo-attach-point="advancedOrderBy" type="text"
+ <textarea id="advancedOrderBy_${id}"
+ data-dojo-attach-point="advancedOrderBy" type="text"
data-dojo-type="dijit/form/SimpleTextarea"
data-dojo-props=" name: 'orderBy',
rows: 1,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org