modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java | 27 ++++++---- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java | 3 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java | 4 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java | 3 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java | 4 + 5 files changed, 26 insertions(+), 15 deletions(-)
New commits: commit aa14f1b66731c4a3c4af55be772c8a0da611ad73 Author: John Mazzitelli mazz@redhat.com Date: Fri Dec 17 03:51:13 2010 -0500
get more perms so non-auth user can't get to deployments
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java index 147aaf0..a2412d5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java @@ -47,8 +47,11 @@ import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; */ public class BundleDeploymentListView extends Table<RPCDataSource<BundleDeployment>> {
- public BundleDeploymentListView(String locatorId, Criteria criteria) { + private final boolean canManageBundles; + + public BundleDeploymentListView(String locatorId, Criteria criteria, boolean canManageBundles) { super(locatorId, MSG.view_bundle_bundleDeployments(), criteria); + this.canManageBundles = canManageBundles; setDataSource(new BundleDeploymentDataSource()); setHeaderIcon("subsystems/bundle/BundleDeployment_24.png"); } @@ -70,14 +73,18 @@ public class BundleDeploymentListView extends Table<RPCDataSource<BundleDeployme deployTimeField.setType(ListGridFieldType.DATE); deployTimeField.setDateFormatter(DateDisplayFormat.TOLOCALESTRING);
- nameField.setCellFormatter(new CellFormatter() { - public String format(Object o, ListGridRecord record, int i, int i1) { - return "<a href="" - + LinkManager.getBundleDeploymentLink(record - .getAttributeAsInt(BundleDeploymentDataSource.FIELD_BUNDLE_ID), record - .getAttributeAsInt(BundleDeploymentDataSource.FIELD_ID)) + "">" + String.valueOf(o) + "</a>"; - } - }); + // only users that are authorized can see deployments + if (canManageBundles) { + nameField.setCellFormatter(new CellFormatter() { + public String format(Object o, ListGridRecord record, int i, int i1) { + return "<a href="" + + LinkManager.getBundleDeploymentLink(record + .getAttributeAsInt(BundleDeploymentDataSource.FIELD_BUNDLE_ID), record + .getAttributeAsInt(BundleDeploymentDataSource.FIELD_ID)) + "">" + String.valueOf(o) + + "</a>"; + } + }); + }
bundleVersionField.setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord record, int i, int i1) { @@ -116,7 +123,7 @@ public class BundleDeploymentListView extends Table<RPCDataSource<BundleDeployme if (selectedRows != null && selectedRows.length == 1) { String selectedId = selectedRows[0].getAttribute(BundleVersionDataSource.FIELD_BUNDLE_ID); String selectedVersionId = selectedRows[0].getAttribute(BundleVersionDataSource.FIELD_ID); - CoreGUI.goToView(LinkManager.getBundleDestinationLink(Integer.valueOf(selectedId), Integer + CoreGUI.goToView(LinkManager.getBundleDeploymentLink(Integer.valueOf(selectedId), Integer .valueOf(selectedVersionId))); } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java index b4aaba8..c298b35 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java @@ -197,7 +197,8 @@ public class BundleDestinationView extends LocatableVLayout implements Bookmarka private Table createDeploymentsTable() { Criteria criteria = new Criteria(); criteria.addCriteria("bundleDestinationId", destination.getId()); - BundleDeploymentListView deployments = new BundleDeploymentListView(extendLocatorId("Deployments"), criteria); + BundleDeploymentListView deployments = new BundleDeploymentListView(extendLocatorId("Deployments"), criteria, + canManageBundles); deployments.setHeight100(); deployments.setShowResizeBar(true); return deployments; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java index 36968e8..b567a0a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java @@ -100,10 +100,10 @@ public class BundleView extends LocatableVLayout implements BookmarkableView { BundleTopView.VIEW_ID.getTitle()); headerLabel = new HeaderLabel("subsystems/bundle/Bundle_24.png", bundle.getName()); tabs = new LocatableTabSet(getLocatorId()); - destinationsTab = createDestinationsTab(); versionsTab = createVersionsTab(); - tabs.addTab(destinationsTab); + destinationsTab = createDestinationsTab(); tabs.addTab(versionsTab); + tabs.addTab(destinationsTab);
addMember(backButton); addMember(headerLabel); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java index e3e8567..ad55799 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java @@ -169,7 +169,8 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV Criteria criteria = new Criteria(); criteria.setAttribute("bundleVersionId", version.getId());
- tab.setPane(new BundleDeploymentListView(tab.getLocatorId(), criteria)); + // TODO: get user perm, if has manage_bundle, pass true + tab.setPane(new BundleDeploymentListView(tab.getLocatorId(), criteria, false));
return tab; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java index 7192f94..2517d3e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java @@ -110,7 +110,9 @@ public class TaggedView extends LocatableVLayout implements BookmarkableView { tab.setPane(bundleVersionListView); container.addTab(tab);
- BundleDeploymentListView bundleDeploymentListView = new BundleDeploymentListView(getLocatorId(), criteria); + // TODO: get manage_bundle perm, if user has it pass true + BundleDeploymentListView bundleDeploymentListView = new BundleDeploymentListView(getLocatorId(), criteria, + false); viewsWithTags.add(bundleDeploymentListView); tab = new LocatableTab(extendLocatorId("bundleDeploymentsList"), MSG.view_bundle_bundleDeployments()); tab.setPane(bundleDeploymentListView);