modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java | 13 ++++++++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java | 7 ++++- 2 files changed, 17 insertions(+), 3 deletions(-)
New commits: commit 737e543becd2449b9db3c0d8774e52c41ad3db94 Author: Jirka Kremser jkremser@redhat.com Date: Wed Mar 13 16:15:20 2013 +0100
[BZ 849711] Showing the delete button only from the list of agents page (hiding it on the aff. group details page and server detail page). Adding JavaDoc.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java index 55bddbb..a5e9ac5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java @@ -51,7 +51,12 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message;
/** * Shows the table of all agents. - * + * + * This component is used from three various contexts: + * 1) simple list of all available agents (url fragment - #Administration/Topology/Agents) + * 2) list of agents connected to the server on server detail page (#Administration/Topology/Servers/{serverId}) + * 3) list of agents assigned to a affinity group (#Administration/Topology/AffinityGroups/{aGroupId}) + * * @author Jirka Kremser */ public class AgentTableView extends TableSection<AgentDatasource> implements HasViewName { @@ -127,8 +132,12 @@ public class AgentTableView extends TableSection<AgentDatasource> implements Has } }
- setupDeleteButton(); + // list of all agents (context #1 see the class JavaDoc) + if (id == null) { + setupDeleteButton(); + }
+ // list of agents assigned to affinity group (context #3) if (isAffinityGroupId) { showUpdateMembersAction(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java index cdce529..c46c925 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java @@ -55,7 +55,12 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message;
/** * Shows the table of all servers. - * + * + * This component is used from three various contexts: + * 1) simple list of all available servers (url fragment - #Administration/Topology/Servers) + * 2) list of servers in the agent's failover list (#Administration/Topology/Agents/{agentId}) + * 3) list of servers assigned to a affinity group (#Administration/Topology/AffinityGroups/{aGroupId}) + * * @author Jirka Kremser */ public class ServerTableView extends
rhq-commits@lists.fedorahosted.org