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 2018/03/30 13:06:43 UTC
qpid-broker-j git commit: QPID-7925: [Broker-J] Fix passing initial
data and add indication that "Default result" is a mandatory field
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 8293a4746 -> 818cd7d3e
QPID-7925: [Broker-J] Fix passing initial data and add indication that "Default result" is a mandatory field
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/818cd7d3
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/818cd7d3
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/818cd7d3
Branch: refs/heads/master
Commit: 818cd7d3ea7849e64364729d5d55c533c4fab609
Parents: 8293a47
Author: Alex Rudyy <or...@apache.org>
Authored: Fri Mar 30 14:05:43 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Fri Mar 30 14:06:08 2018 +0100
----------------------------------------------------------------------
.../main/java/resources/accesscontrolprovider/rulebased/add.html | 2 +-
.../java/resources/js/qpid/management/addAccessControlProvider.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/818cd7d3/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/rulebased/add.html
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/rulebased/add.html b/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/rulebased/add.html
index 671a81a..c7b27c4 100644
--- a/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/rulebased/add.html
+++ b/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/rulebased/add.html
@@ -19,7 +19,7 @@
<div>
<div class="clear">
- <div class="formLabel-labelCell tableContainer-labelCell">Default Result:</div>
+ <div class="formLabel-labelCell tableContainer-labelCell">Default Result*:</div>
<input type="text" id="addAccessControlProvider.ruleBased.defaultResult"
data-dojo-type="dijit/form/FilteringSelect"
data-dojo-props="
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/818cd7d3/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
index dd5a2fa..bfdd804 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAccessControlProvider.js
@@ -163,7 +163,7 @@ define(["dojo/_base/lang",
typeUI.show({
containerNode: typeFieldsContainer,
parent: that,
- data: that.initialData,
+ initialData: that.initialData || {},
effectiveData: that.effectiveData,
metadata: that.management.metadata,
category: category,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org