Author: orudyy
Date: Fri Jan 30 10:12:16 2015
New Revision: 1655975
URL: http://svn.apache.org/r1655975
Log:
QPID-6351: [Java Broker] Remove provider name from edit UI, remove button 'Add
Preferences Provider' from Authentication provider tab and fix disabled
preferences provider fields in Add Authentication provider dialog
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/preferencesprovider/preferencesProviderForm.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js?rev=1655975&r1=1655974&r2=1655975&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/AuthenticationProvider.js
Fri Jan 30 10:12:16 2015
@@ -33,12 +33,11 @@ define(["dojo/_base/xhr",
"dojo/dom-style",
"dojox/html/entities",
"dojo/dom",
- "qpid/management/addPreferencesProvider",
"qpid/management/PreferencesProvider",
"qpid/management/authenticationprovider/PrincipalDatabaseAuthenticationManager",
"dojo/domReady!"],
function (xhr, parser, query, connect, properties, updater, util,
UpdatableStore, EnhancedGrid,
- addAuthenticationProvider, event, registry, domStyle, entities,
dom, addPreferencesProvider, PreferencesProvider,
PrincipalDatabaseAuthenticationManager) {
+ addAuthenticationProvider, event, registry, domStyle, entities,
dom, PreferencesProvider, PrincipalDatabaseAuthenticationManager) {
function AuthenticationProvider(name, parent, controller) {
this.name = name;
@@ -79,14 +78,6 @@ define(["dojo/_base/xhr",
that.deleteAuthenticationProvider();
});
- var addPreferencesProviderButton =
query(".addPreferencesProviderButton", contentPane.containerNode)[0];
- var addPreferencesProviderWidget =
registry.byNode(addPreferencesProviderButton);
- connect.connect(addPreferencesProviderWidget,
"onClick",
- function(evt){
- event.stop(evt);
- that.addPreferencesProvider();
- });
-
authProviderUpdater.update();
if
(util.isProviderManagingUsers(authProviderUpdater.authProviderData.type))
{
@@ -136,14 +127,6 @@ define(["dojo/_base/xhr",
}
};
- AuthenticationProvider.prototype.addPreferencesProvider =
function() {
- if (this.authProviderUpdater &&
this.authProviderUpdater.authProviderData
- &&
(!this.authProviderUpdater.authProviderData.preferencesproviders
- ||
!this.authProviderUpdater.authProviderData.preferencesproviders[0])){
- addPreferencesProvider.show(this.name);
- }
- };
-
function AuthProviderUpdater(node, authProviderObj, controller,
authenticationProvider)
{
this.controller = controller;
@@ -154,7 +137,6 @@ define(["dojo/_base/xhr",
this.preferencesProviderType=dom.byId("preferencesProviderType");
this.preferencesProviderName=dom.byId("preferencesProviderName");
this.preferencesProviderState=dom.byId("preferencesProviderState");
- this.addPreferencesProviderButton =
query(".addPreferencesProviderButton", node)[0];
this.editPreferencesProviderButton =
query(".editPreferencesProviderButton", node)[0];
this.deletePreferencesProviderButton =
query(".deletePreferencesProviderButton", node)[0];
this.preferencesProviderAttributes =
dom.byId("preferencesProviderAttributes")
@@ -169,7 +151,6 @@ this.authenticationProviderDetailsContai
{
if (preferencesProviderData)
{
- this.addPreferencesProviderButton.style.display = 'none';
if (!this.preferencesProvider)
{
var preferencesProvider =new
PreferencesProvider(preferencesProviderData.name, this.authProviderData);
@@ -184,7 +165,6 @@ this.authenticationProviderDetailsContai
{
this.preferencesProvider.update(null);
}
- this.addPreferencesProviderButton.style.display = 'inline';
}
};
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js?rev=1655975&r1=1655974&r2=1655975&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/PreferencesProvider.js
Fri Jan 30 10:12:16 2015
@@ -56,7 +56,6 @@ define(["dojo/_base/xhr",
that.containerNode = node;
that.parentObject = parentObject;
that.preferencesProviderType=query(".preferencesProviderType", node)[0];
-
that.preferencesProviderName=query(".preferencesProviderName", node)[0];
that.preferencesProviderState=query(".preferencesProviderState", node)[0];
that.editPreferencesProviderButton =
query(".editPreferencesProviderButton", node)[0];
that.deletePreferencesProviderButton =
query(".deletePreferencesProviderButton", node)[0];
@@ -137,7 +136,6 @@ define(["dojo/_base/xhr",
this.editPreferencesProviderButton.style.display = 'inline';
this.deletePreferencesProviderButton.style.display = 'inline';
this.preferencesProviderType.innerHTML =
entities.encode(String(data.type));
- this.preferencesProviderName.innerHTML =
entities.encode(String(data.name));
this.preferencesProviderState.innerHTML =
entities.encode(String(data.state));
if (!this.details)
{
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js?rev=1655975&r1=1655974&r2=1655975&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
Fri Jan 30 10:12:16 2015
@@ -60,6 +60,7 @@ define(["dojo/_base/xhr",
this.authenticationProviderName =
registry.byId("addAuthenticationProvider.name");
this.authenticationProviderName.set("regExpGen",
util.nameOrContextVarRegexp);
+ this.authenticationProviderName.on("change",
function(newValue){that.preferencesProviderForm.preferencesProviderNameWidget.set("value",newValue);});
this.dialog = registry.byId("addAuthenticationProvider");
this.addButton =
registry.byId("addAuthenticationProvider.addButton");
@@ -102,7 +103,7 @@ define(["dojo/_base/xhr",
this.initialData = actualData;
this.effectiveData = effectiveData;
this.authenticationProviderType.set("value",
actualData.type);
- this.authenticationProviderName.set("value",
actualData.name);
+
this.authenticationProviderType.set("disabled", true);
this.authenticationProviderName.set("disabled", true);
if (actualData.preferencesproviders &&
actualData.preferencesproviders[0])
@@ -113,6 +114,7 @@ define(["dojo/_base/xhr",
{
this.preferencesProviderForm.reset();
}
+ this.authenticationProviderName.set("value",
actualData.name);
}
else
{
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js?rev=1655975&r1=1655974&r2=1655975&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/preferencesprovider/PreferencesProviderForm.js
Fri Jan 30 10:12:16 2015
@@ -193,6 +193,10 @@ function (util, metadata, xhr, declare,
{
this.reset();
}
+ else
+ {
+ this._toggleWidgets(this.preferencesProviderTypeWidget.value);
+ }
},
});
});
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/preferencesprovider/preferencesProviderForm.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/preferencesprovider/preferencesProviderForm.html?rev=1655975&r1=1655974&r2=1655975&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/preferencesprovider/preferencesProviderForm.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/preferencesprovider/preferencesProviderForm.html
Fri Jan 30 10:12:16 2015
@@ -23,7 +23,7 @@
<div class="formBox">
<fieldset>
<legend>Preferences Provider</legend>
- <div class="clear">
+ <div class="clear hidden">
<div class="formLabel-labelCell
tableContainer-labelCell">Name*:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
<input type="text"
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html?rev=1655975&r1=1655974&r2=1655975&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html
Fri Jan 30 10:12:16 2015
@@ -37,7 +37,6 @@
<div class="clear dijitDialogPaneActionBar">
<button data-dojo-type="dijit.form.Button"
class="editAuthenticationProviderButton" type="button"
data-dojo-props="disabled: true">Edit</button>
<button data-dojo-type="dijit.form.Button"
class="deleteAuthenticationProviderButton" type="button">Delete</button>
- <button data-dojo-type="dijit.form.Button"
class="addPreferencesProviderButton">Add Preferences Provider</button>
</div>
</div>
<br/>
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html?rev=1655975&r1=1655974&r2=1655975&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html
Fri Jan 30 10:12:16 2015
@@ -25,10 +25,6 @@
<div class="preferencesProviderType"></div>
</div>
<div class="clear">
- <div class="formLabel-labelCell">Name:</div>
- <div class="preferencesProviderName"></div>
- </div>
- <div class="clear">
<div class="formLabel-labelCell">State:</div>
<div class="preferencesProviderState"></div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
