diff options
Diffstat (limited to 'java/broker-plugins')
3 files changed, 42 insertions, 1 deletions
diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js b/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js index 878cf9e3fe..3fc60854f6 100644 --- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js +++ b/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js @@ -28,7 +28,7 @@ var updateUI = function updateUI(data) if(data.user) { dom.byId("authenticatedUser").innerHTML = data.user; - dojo.style(dom.byId("login"), {display: 'block'}); + dom.byId("login").style.display = "block"; } }; diff --git a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js b/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js index eeac5b5c0b..a27e43d1b1 100644 --- a/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js +++ b/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js @@ -492,6 +492,7 @@ define(["dojo/_base/xhr", this.controller = controller; this.query = "rest/broker"; this.attributes = attributes; + this.accessControlProvidersWarn = query(".broker-access-control-providers-warning", node)[0] var that = this; xhr.get({url: this.query, sync: properties.useSyncGet, handleAs: "json"}) @@ -647,6 +648,7 @@ define(["dojo/_base/xhr", that.controller.show("accesscontrolprovider", name, brokerObj); }); }, gridProperties, EnhancedGrid); + that.displayACLWarnMessage(aclData); }); xhr.get({url: "rest/logrecords", sync: properties.useSyncGet, handleAs: "json"}) @@ -715,6 +717,43 @@ define(["dojo/_base/xhr", } }; + BrokerUpdater.prototype.displayACLWarnMessage = function(aclProviderData) + { + var message = ""; + if (aclProviderData.length > 1) + { + var aclProviders = {}; + var theSameTypeFound = false; + for(var d=0; d<aclProviderData.length; d++) + { + var acl = aclProviderData[d]; + var aclType = acl.type; + if (aclProviders[aclType]) + { + aclProviders[aclType].push(acl.name); + theSameTypeFound = true; + } + else + { + aclProviders[aclType] = [acl.name]; + } + } + + if (theSameTypeFound) + { + message = "Only one instance of a given type will be used. Please remove an instance of type(s):"; + for(var aclType in aclProviders) + { + if(aclProviders[aclType].length>1) + { + message += " " + aclType; + } + } + } + } + this.accessControlProvidersWarn.innerHTML = message; + } + BrokerUpdater.prototype.update = function() { @@ -749,6 +788,7 @@ define(["dojo/_base/xhr", { var data = that.brokerData.accesscontrolproviders ? that.brokerData.accesscontrolproviders :[]; that.accessControlProvidersGrid.update(data); + that.displayACLWarnMessage(data); } }); diff --git a/java/broker-plugins/management-http/src/main/java/resources/showBroker.html b/java/broker-plugins/management-http/src/main/java/resources/showBroker.html index 15f7faf318..d9991452af 100644 --- a/java/broker-plugins/management-http/src/main/java/resources/showBroker.html +++ b/java/broker-plugins/management-http/src/main/java/resources/showBroker.html @@ -184,6 +184,7 @@ </div> <br/> <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Access Control Providers'"> + <div class="broker-access-control-providers-warning" style="color: red"></div> <div class="broker-access-control-providers"></div> <button data-dojo-type="dijit.form.Button" class="addAccessControlProvider">Add Access Control Provider</button> <button data-dojo-type="dijit.form.Button" class="deleteAccessControlProvider">Delete Access Control Provider</button> |