[rhq] modules/enterprise
by ips
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java | 5 +--
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java | 13 ++++++++++
2 files changed, 15 insertions(+), 3 deletions(-)
New commits:
commit 27347764530d4ecfd3866b3b89994c08a51345d0
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu Dec 2 15:10:09 2010 -0500
fix issue where Role create would fail with hibernate exception if any LDAP groups were specified
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java
index bb242fa..8f99eef 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java
@@ -186,13 +186,12 @@ public class SubjectManagerBean implements SubjectManagerLocal, SubjectManagerRe
@Override
public Subject createSubject(Subject whoami, Subject subjectToCreate, String password)
throws SubjectException, EntityExistsException {
- // Make sure there's not an existing subject with the same name.
if (getSubjectByName(subjectToCreate.getName()) != null) {
throw new EntityExistsException("A user named [" + subjectToCreate.getName() + "] already exists.");
}
if (subjectToCreate.getFsystem()) {
- throw new SubjectException("Cannot create new system subjects: " + subjectToCreate.getName());
+ throw new SubjectException("Cannot create new system users: " + subjectToCreate.getName());
}
entityManager.persist(subjectToCreate);
@@ -296,7 +295,7 @@ public class SubjectManagerBean implements SubjectManagerLocal, SubjectManagerRe
public Subject createSubject(Subject whoami, Subject subject) throws SubjectException {
// Make sure there's not an existing subject with the same name.
if (getSubjectByName(subject.getName()) != null) {
- throw new SubjectException("A user named [" + subject.getName() + "] already exists.");
+ throw new EntityExistsException("A user named [" + subject.getName() + "] already exists.");
}
if (subject.getFsystem()) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java
index 14ce313..ebea73b 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java
@@ -137,8 +137,21 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote {
*/
@RequiredPermission(Permission.MANAGE_SECURITY)
public Role createRole(Subject subject, Role newRole) {
+ // TODO (ips): Do we want to enforce uniqueness of the Role name?
+
+ if (newRole.getFsystem()) {
+ throw new IllegalArgumentException("Unable to create role [" + newRole.getName()
+ + "] - new system roles cannot be created.");
+ }
processDependentPermissions(newRole);
+
+ Set<LdapGroup> ldapGroups = newRole.getLdapGroups();
+ for (LdapGroup ldapGroup : ldapGroups) {
+ ldapGroup.setRole(newRole);
+ }
+
entityManager.persist(newRole);
+
return newRole;
}
13 years, 6 months
[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/webapp/images/global/Role_24.png |binary
1 file changed
New commits:
commit b02b960088173899d4a8560d4290ce08edcb3e47
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Dec 2 15:03:11 2010 -0500
sharpen up the image
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/global/Role_24.png b/modules/enterprise/gui/coregui/src/main/webapp/images/global/Role_24.png
index bc61321..7b57d6c 100644
Binary files a/modules/enterprise/gui/coregui/src/main/webapp/images/global/Role_24.png and b/modules/enterprise/gui/coregui/src/main/webapp/images/global/Role_24.png differ
13 years, 6 months
[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java | 2 +-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 06e5641a7c02da5a2c2a5e295b352d01e997aafd
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Dec 2 14:50:47 2010 -0500
fix the name of the "provide bundle distro" wizard step
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
index 8c4b280..b776302 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
@@ -124,7 +124,7 @@ public class BundleUploadDistroFileStep extends AbstractWizardStep {
}
public String getName() {
- return MSG.view_bundle_createWizard_uploadStepName();
+ return MSG.view_bundle_createWizard_provideBundleDistro();
}
private DynamicForm createUrlForm() {
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index 9095013..24e03aa 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -882,6 +882,7 @@ view_bundle_createWizard_youMustChooseOne=You must choose one option in order to
view_bundle_createWizard_urlOption=URL~
view_bundle_createWizard_uploadOption=Upload~
view_bundle_createWizard_recipeOption=Recipe~
+view_bundle_createWizard_provideBundleDistro=Provide a Bundle Distribution~
view_bundle_createWizard_clickToUploadRecipe=Click to upload a recipe file~
view_bundle_createWizard_createFailure=Failed to create the bundle~
view_bundle_createWizard_createSuccessful=You have successfully created a bundle named [{0}] with a version of [{1}]~
13 years, 6 months
[rhq] modules/enterprise
by ips
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 21 ++++------
1 file changed, 10 insertions(+), 11 deletions(-)
New commits:
commit b685148f850399650eca2410c368f05c9065e5d4
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu Dec 2 14:37:08 2010 -0500
add tildes to messages that were missing them; remove a dup message key
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index 5e9decc..9095013 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -63,8 +63,8 @@ common_label_selected_resources = selected resources~
common_label_unlimited = unlimited~
common_label_user = user~
common_label_users = users~
-common_label_week=week~
-common_label_weeks=weeks~
+common_label_week = week~
+common_label_weeks = weeks~
# Common Titles
#--------------
@@ -882,7 +882,6 @@ view_bundle_createWizard_youMustChooseOne=You must choose one option in order to
view_bundle_createWizard_urlOption=URL~
view_bundle_createWizard_uploadOption=Upload~
view_bundle_createWizard_recipeOption=Recipe~
-view_bundle_createWizard_uploadStepName=Provide a Bundle Distribution~
view_bundle_createWizard_clickToUploadRecipe=Click to upload a recipe file~
view_bundle_createWizard_createFailure=Failed to create the bundle~
view_bundle_createWizard_createSuccessful=You have successfully created a bundle named [{0}] with a version of [{1}]~
@@ -988,7 +987,7 @@ view_tags_tags = Tags~
view_tags_error_1 = Failed to load Tags~
view_tags_tooltip_1 = Click to remove this Tag~
view_tags_tooltip_2 = Click to edit Tags~
-view_tags_tooltip_3 = Enter a Tag in the format: (namespace:)(semantic=)tagname (e.g. it:env=QA, or owner=John)
+view_tags_tooltip_3 = Enter a Tag in the format: (namespace:)(semantic=)tagname (e.g. it:env=QA, or owner=John)~
# File Upload (various)
view_upload_alreadyUploaded = File has already been uploaded~
@@ -1198,7 +1197,7 @@ view_tree_common_contextMenu_addChartToDashboard=Add chart to dashboard [{0}]~
view_tree_common_contextMenu_chart=Chart~
view_tree_common_contextMenu_saveChartToDashboardSuccessful=You have saved dashboard [{0}]~
view_tree_common_contextMenu_saveChartToDashboardFailure=Failed to save the dashboard~
-view_tree_common_contextMenu_loadFailed_dashboard=Failed to load user dashboards
+view_tree_common_contextMenu_loadFailed_dashboard=Failed to load user dashboards~
view_tree_common_contextMenu_loadFailed_manualAddChildren=Failed to load platform manual add children~
view_tabs_common_agent=Agent~
view_tabs_common_summary=Summary~
@@ -1242,7 +1241,7 @@ view_titleBar_common_addedFav=You have added [{0}] as a favorite~
view_titleBar_common_removedFavFailure=Failed to remove [{0}] as one of your favorites~
view_titleBar_common_addedFavFailure=Failed to add [{0}] as a favorite~
view_titleBar_group_failInfo = Failed to get general info on group [{0}] with ID [{1}]~
-view_titleBar_group_summary_collapsedTooltip = Click to show more details for this group~
+view_titleBar_group_summary_collapsedTooltip = Click to show more details for this group~
view_titleBar_group_summary_expandedTooltip = Click to hide details for this group~
view_dynagroup_expressionSet=Expression Set~
view_dynagroup_recalculationInterval=Recalculation Interval~
@@ -1339,7 +1338,7 @@ view_connectionSettingsDetails_somePropertiesInvalid = The following connection
#-----------------------------------------
view_resourceResourceGroupList_error_fetchFailure = Failed to fetch Resource''s groups.~
view_resourceResourceGroupList_error_updateFailure = Failed to update assigned Resource groups.~
-view_resourceResourceGroupList_message_updateSuccess = Group membership updated for [{0}].
+view_resourceResourceGroupList_message_updateSuccess = Group membership updated for [{0}].~
# Configuration Details
#-------------------------------
@@ -1352,7 +1351,7 @@ view_configurationDetails_somePropertiesInvalid = The following configuration pr
# Configuration History List
view_configurationHistoryList_title = Configuration History~
-view_configurationHistoryList_itemNamePlural = configuration history items
+view_configurationHistoryList_itemNamePlural = configuration history items~
# Configuration History Details
#------------------------------------------
@@ -1422,8 +1421,8 @@ view_summaryOverviewForm_field_location = Location~
view_summaryOverviewForm_field_version = Version~
view_summaryOverviewForm_field_parent = Parent~
view_summaryOverviewForm_error_traitsLoadFailure = Failed to load traits for {0}.~
-view_summaryOverviewForm_label_plugin = Plugin:
-view_summaryOverviewForm_label_type = Type:
+view_summaryOverviewForm_label_plugin = Plugin:~
+view_summaryOverviewForm_label_type = Type:~
view_summaryOverviewForm_header_summary = Summary~
view_summaryOverviewForm_error_nameChangeFailure = Failed to change name of Resource with id {0} from [{1}] to [{2}].~
view_summaryOverviewForm_message_nameChangeSuccess = Name of Resource with id {0} was changed from [{1}] to [{2}].~
@@ -1507,7 +1506,7 @@ view_login_welcomeMsg = Welcome to JBoss ON! <br/><br/> Enter/update the followi
# Menu Bar
#--------------
-view_menuBar_logout = logout~
+view_menuBar_logout = Logout~
# Search Bar, GUI
#-----------------
13 years, 6 months
[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 2 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewForm.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8c103cdbf62f8bfc77369073290b32f0f937021c
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Dec 2 14:36:09 2010 -0500
the criteria needs to get the parent - we at least need the parent's name in the resource title bar
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
index 12646d2..a4ccd2e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
@@ -388,7 +388,7 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
ResourceCriteria criteria = new ResourceCriteria();
criteria.addFilterId(resourceId);
criteria.fetchTags(true);
- //criteria.fetchParentResource(true);
+ criteria.fetchParentResource(true);
GWTServiceLookup.getResourceService().findResourceCompositesByCriteria(criteria,
new AsyncCallback<PageList<ResourceComposite>>() {
public void onFailure(Throwable caught) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewForm.java
index bdff290..74bafdb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewForm.java
@@ -294,7 +294,7 @@ public class OverviewForm extends EnhancedDynamicForm {
setValue("location", resource.getLocation());
setValue("version", (resource.getVersion() != null) ? resource.getVersion() : "<i>" + MSG.common_label_none()
+ "</i>");
- Resource parentResource = resource.getParentResource();
+ Resource parentResource = this.resourceComposite.getParent();
setValue("parent", parentResource != null ? ("<a href=\"#Resource/" + parentResource.getId() + "\">"
+ parentResource.getName() + "</a>") : "<i>" + MSG.common_label_none() + "</i>");
}
13 years, 6 months
[rhq] modules/enterprise
by ips
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java | 22 +++++-----
1 file changed, 13 insertions(+), 9 deletions(-)
New commits:
commit 1213b41f6f98dbf4fbbe828efbacf1f4f8591799
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu Dec 2 14:27:34 2010 -0500
add icons to all left nav items in Admin view
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
index 082d77f..2cf9119 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
@@ -120,28 +120,28 @@ public class AdministrationView extends AbstractSectionedLeftNavigationView {
}
private NavigationSection buildTopologySection() {
- NavigationItem serversItem = new NavigationItem(PAGE_SERVERS_VIEW_ID, null, new ViewFactory() {
+ NavigationItem serversItem = new NavigationItem(PAGE_SERVERS_VIEW_ID, "types/Server_up_16.png", new ViewFactory() {
public Canvas createView() {
return new FullHTMLPane(extendLocatorId(PAGE_SERVERS_VIEW_ID.getName()),
"/rhq/ha/listServers-plain.xhtml?nomenu=true");
}
});
- NavigationItem agentsItem = new NavigationItem(PAGE_AGENTS_VIEW_ID, null, new ViewFactory() {
+ NavigationItem agentsItem = new NavigationItem(PAGE_AGENTS_VIEW_ID, "global/Agent_16.png", new ViewFactory() {
public Canvas createView() {
return new FullHTMLPane(extendLocatorId(PAGE_AGENTS_VIEW_ID.getName()),
"/rhq/ha/listAgents-plain.xhtml?nomenu=true");
}
});
- NavigationItem affinityGroupsItem = new NavigationItem(PAGE_AFFINITY_GROUPS_VIEW_ID, null, new ViewFactory() {
+ NavigationItem affinityGroupsItem = new NavigationItem(PAGE_AFFINITY_GROUPS_VIEW_ID, "types/Group_up_16.png", new ViewFactory() {
public Canvas createView() {
return new FullHTMLPane(extendLocatorId(PAGE_AFFINITY_GROUPS_VIEW_ID.getName()),
"/rhq/ha/listAffinityGroups-plain.xhtml?nomenu=true");
}
});
- NavigationItem partitionEventsItem = new NavigationItem(PAGE_PARTITION_EVENTS_VIEW_ID, null, new ViewFactory() {
+ NavigationItem partitionEventsItem = new NavigationItem(PAGE_PARTITION_EVENTS_VIEW_ID, "subsystems/event/Events_16.png", new ViewFactory() {
public Canvas createView() {
return new FullHTMLPane(extendLocatorId(PAGE_PARTITION_EVENTS_VIEW_ID.getName()),
"/rhq/ha/listPartitionEvents-plain.xhtml?nomenu=true");
@@ -160,35 +160,39 @@ public class AdministrationView extends AbstractSectionedLeftNavigationView {
}
private NavigationSection buildConfigurationSection() {
- NavigationItem systemSettingsItem = new NavigationItem(PAGE_SYSTEM_SETTINGS_VIEW_ID, null, new ViewFactory() {
+ NavigationItem systemSettingsItem = new NavigationItem(PAGE_SYSTEM_SETTINGS_VIEW_ID,
+ "subsystems/configure/Configure_16.png", new ViewFactory() {
public Canvas createView() {
return new FullHTMLPane(extendLocatorId(PAGE_SYSTEM_SETTINGS_VIEW_ID.getName()),
"/admin/config/Config.do?mode=edit&nomenu=true");
}
});
- NavigationItem templatesItem = new NavigationItem(PAGE_TEMPLATES_VIEW_ID, null, new ViewFactory() {
+ NavigationItem templatesItem = new NavigationItem(PAGE_TEMPLATES_VIEW_ID, "types/GroupDefinition_16.png",
+ new ViewFactory() {
public Canvas createView() {
return new ResourceTypeTreeView(extendLocatorId(PAGE_TEMPLATES_VIEW_ID.getName()));
}
});
templatesItem.setRefreshRequired(true); // we always need a new page
- NavigationItem downloadsItem = new NavigationItem(PAGE_DOWNLOADS_VIEW_ID, null, new ViewFactory() {
+ NavigationItem downloadsItem = new NavigationItem(PAGE_DOWNLOADS_VIEW_ID,
+ "subsystems/bundle/BundleDeployment_16.png", new ViewFactory() {
public Canvas createView() {
return new FullHTMLPane(extendLocatorId(PAGE_DOWNLOADS_VIEW_ID.getName()),
"/rhq/admin/downloads-body.xhtml?nomenu=true");
}
});
- NavigationItem licenseItem = new NavigationItem(PAGE_LICENSE_VIEW_ID, null, new ViewFactory() {
+ NavigationItem licenseItem = new NavigationItem(PAGE_LICENSE_VIEW_ID, "subsystems/bundle/Details_11.png",
+ new ViewFactory() {
public Canvas createView() {
return new FullHTMLPane(extendLocatorId(PAGE_LICENSE_VIEW_ID.getName()),
"/admin/license/LicenseAdmin.do?mode=view&nomenu=true");
}
});
- NavigationItem pluginsItem = new NavigationItem(PAGE_PLUGINS_VIEW_ID, null, new ViewFactory() {
+ NavigationItem pluginsItem = new NavigationItem(PAGE_PLUGINS_VIEW_ID, "global/Plugin_16.png", new ViewFactory() {
public Canvas createView() {
return new FullHTMLPane(extendLocatorId(PAGE_PLUGINS_VIEW_ID.getName()),
"/rhq/admin/plugin/plugin-list-plain.xhtml?nomenu=true");
13 years, 6 months
[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/webapp/images/global/Role_24.png |binary
1 file changed
New commits:
commit e04e8a22a13a5f9b40881cf22c7389fe8b3d7670
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Dec 2 14:11:47 2010 -0500
24x24 version of the role image
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/global/Role_24.png b/modules/enterprise/gui/coregui/src/main/webapp/images/global/Role_24.png
new file mode 100644
index 0000000..bc61321
Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/global/Role_24.png differ
13 years, 6 months
[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java | 6 ++++++
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 2 ++
2 files changed, 8 insertions(+)
New commits:
commit fa75a310aa8c2f0b8123f5020c10c2afed3df038
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Dec 2 14:02:24 2010 -0500
add tool tips to the group summary expand/collapse icon, to be consistent with the resource title bar's own expand/collapse icon
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
index 5ef7adb..bfa671c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
@@ -56,6 +56,9 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
private static final String FAV_ICON = "Favorite_24_Selected.png";
private static final String NOT_FAV_ICON = "Favorite_24.png";
+ private static final String COLLAPSED_TOOLTIP = MSG.view_titleBar_group_summary_collapsedTooltip();
+ private static final String EXPANDED_TOOLTIP = MSG.view_titleBar_group_summary_expandedTooltip();
+
private ResourceGroup group;
private ResourceGroupComposite groupComposite;
boolean isAutoGroup;
@@ -102,6 +105,7 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
});
expandCollapseArrow = new Img("[SKIN]/ListGrid/row_collapsed.png", 16, 16);
+ expandCollapseArrow.setTooltip(COLLAPSED_TOOLTIP);
expandCollapseArrow.setLayoutAlign(VerticalAlignment.BOTTOM);
ResourceGroupCriteria criteria = new ResourceGroupCriteria();
criteria.addFilterId(this.group.getId());
@@ -135,9 +139,11 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
collapsed = !collapsed;
if (collapsed) {
expandCollapseArrow.setSrc("[SKIN]/ListGrid/row_collapsed.png");
+ expandCollapseArrow.setTooltip(COLLAPSED_TOOLTIP);
generalProperties.hide();
} else {
expandCollapseArrow.setSrc("[SKIN]/ListGrid/row_expanded.png");
+ expandCollapseArrow.setTooltip(EXPANDED_TOOLTIP);
generalProperties.show();
}
ResourceGroupTitleBar.this.markForRedraw();
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index b8e8c9a..5e9decc 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -1242,6 +1242,8 @@ view_titleBar_common_addedFav=You have added [{0}] as a favorite~
view_titleBar_common_removedFavFailure=Failed to remove [{0}] as one of your favorites~
view_titleBar_common_addedFavFailure=Failed to add [{0}] as a favorite~
view_titleBar_group_failInfo = Failed to get general info on group [{0}] with ID [{1}]~
+view_titleBar_group_summary_collapsedTooltip = Click to show more details for this group~
+view_titleBar_group_summary_expandedTooltip = Click to hide details for this group~
view_dynagroup_expressionSet=Expression Set~
view_dynagroup_recalculationInterval=Recalculation Interval~
view_dynagroup_lastCalculationTime=Last Calculation Time~
13 years, 6 months
[rhq] modules/enterprise
by Joseph Marques
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourceOverviewUIBean.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c301d74c2daace257699a7868a3870e39d7f7da7
Author: Joseph Marques <joseph(a)redhat.com>
Date: Thu Dec 2 13:59:57 2010 -0500
fix sorting issue so that resource overview sub-tab renders properly
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourceOverviewUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourceOverviewUIBean.java
index d39eae9..3a0e811 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourceOverviewUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourceOverviewUIBean.java
@@ -39,7 +39,7 @@ public class ResourceOverviewUIBean {
private List<Alert> getAlerts(Subject subject, int resourceId, int count) {
PageControl lastFive = new PageControl(0, count);
- lastFive.initDefaultOrderingField("a.ctime", PageOrdering.DESC);
+ lastFive.initDefaultOrderingField("ctime", PageOrdering.DESC);
AlertCriteria criteria = new AlertCriteria();
criteria.addFilterResourceIds(resourceId);
13 years, 6 months
[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java | 14 ++++++----
1 file changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 3df06ecff2138a606cbd8249753dfbc242896641
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Dec 2 13:51:21 2010 -0500
don't allow a row to be selected in problem metrics view
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java
index a8a7f6f..ec37fcb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java
@@ -22,7 +22,9 @@
*/
package org.rhq.enterprise.gui.coregui.client.report.measurement;
+import com.smartgwt.client.types.SelectionStyle;
import com.smartgwt.client.widgets.grid.CellFormatter;
+import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
@@ -43,15 +45,17 @@ public class MeasurementOOBView extends Table {
@Override
protected void configureTable() {
- getListGrid().setAlternateRecordStyles(false);
-
- getListGrid().getField("resourceName").setCellFormatter(new CellFormatter() {
+ ListGrid grid = getListGrid();
+ grid.setAlternateRecordStyles(false);
+ grid.getField("resourceName").setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
return "<a href=\"#Resource/" + listGridRecord.getAttribute("resourceId") + "\">" + o + "</a>";
}
});
-
-
}
+ @Override
+ protected SelectionStyle getDefaultSelectionStyle() {
+ return SelectionStyle.NONE;
+ }
}
13 years, 6 months