modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java | 14 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java | 4 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java | 4 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java | 9 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 24 +++++++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 3 + modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 2 14 files changed, 66 insertions(+), 7 deletions(-)
New commits: commit bef3bcffc69eeb48e723604f32441b518c2457a8 Author: John Mazzitelli mazz@redhat.com Date: Wed Apr 3 18:19:10 2013 -0400
BZ 535289 - get inventory status to be a field that the GWT server-side sends over the wire don't show the resource link or support double clicking if the resource is ignored
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java index 8025a0b..fb2d139 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java @@ -308,7 +308,7 @@ public class ResourceDatasource extends RPCDataSource<Resource, ResourceCriteria record.setAttribute(ITIME.propertyName(), from.getItime()); record.setAttribute(MTIME.propertyName(), from.getMtime()); record.setAttribute(MODIFIER.propertyName(), from.getModifiedBy()); - record.setAttribute(INVENTORY_STATUS.propertyName(), from.getInventoryStatus()); + record.setAttribute(INVENTORY_STATUS.propertyName(), from.getInventoryStatus().name());
record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, from.getAncestry()); record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID, from.getResourceType().getId()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java index 0d1a6f5..719bbb7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java @@ -54,6 +54,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.search.SearchSubsystem; @@ -440,8 +441,11 @@ public class ResourceSearchView extends Table { ListGrid listGrid = (ListGrid) event.getSource(); ListGridRecord[] selectedRows = listGrid.getSelectedRecords(); if (selectedRows != null && selectedRows.length == 1) { - String selectedId = selectedRows[0].getAttribute("id"); - CoreGUI.goToView(LinkManager.getResourceLink(Integer.valueOf(selectedId))); + String invStatus = selectedRows[0].getAttribute(INVENTORY_STATUS.propertyName()); + if (InventoryStatus.COMMITTED == InventoryStatus.valueOf(invStatus)) { + String selectedId = selectedRows[0].getAttribute("id"); + CoreGUI.goToView(LinkManager.getResourceLink(Integer.valueOf(selectedId))); + } } } }); @@ -505,9 +509,14 @@ public class ResourceSearchView extends Table { ListGridField nameField = new ListGridField(NAME.propertyName(), NAME.title(), 250); nameField.setCellFormatter(new CellFormatter() { public String format(Object value, ListGridRecord record, int rowNum, int colNum) { - String url = LinkManager.getResourceLink(record.getAttributeAsInt("id")); - String name = StringUtility.escapeHtml(value.toString()); - return LinkManager.getHref(url, name); + String invStatus = record.getAttribute(INVENTORY_STATUS.propertyName()); + if (InventoryStatus.COMMITTED == InventoryStatus.valueOf(invStatus)) { + String url = LinkManager.getResourceLink(record.getAttributeAsInt("id")); + String name = StringUtility.escapeHtml(value.toString()); + return LinkManager.getHref(url, name); + } else { + return value.toString(); + } } }); nameField.setShowHover(true); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java index d9c74f6..8483106 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java @@ -87,6 +87,7 @@ public class ResourceGWTServiceImpl extends AbstractGWTServiceImpl implements Re "modifiedBy", // "location", // "resourceType", // + "inventoryStatus", // "childResources", // "parentResource", // // "resourceConfiguration \n" +
commit 71c7bd444860640e70cd9ee6fad1a0009da34397 Author: John Mazzitelli mazz@redhat.com Date: Wed Apr 3 17:29:56 2013 -0400
BZ 535289 - provide a Inventory>Ignored Resources item to view resources that are ignored. This isn't finished yet, need to add the ability to unignore them
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java index fa58e8a..dea213e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java @@ -29,6 +29,7 @@ import com.smartgwt.client.widgets.Label;
import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.group.GroupCategory; import org.rhq.enterprise.gui.coregui.client.IconEnum; @@ -73,6 +74,8 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { private static final ViewName PAGE_SERVERS = new ViewName("Servers", MSG.view_inventory_servers(), IconEnum.SERVERS); private static final ViewName PAGE_SERVICES = new ViewName("Services", MSG.view_inventory_services(), IconEnum.SERVICES); + private static final ViewName PAGE_IGNORED_RESOURCES = new ViewName("IgnoredResources", + MSG.view_inventory_ignoredResources(), IconEnum.ALL_RESOURCES); private static final ViewName PAGE_UNAVAIL_SERVERS = new ViewName("UnavailableServers", MSG.view_inventory_unavailableServers(), IconEnum.UNAVAILABLE_SERVERS);
@@ -190,6 +193,15 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { } });
+ NavigationItem ignoredResourcesItem = new NavigationItem(PAGE_IGNORED_RESOURCES, new ViewFactory() { + public Canvas createView() { + Criteria initialCriteria = new Criteria(ResourceDataSourceField.INVENTORY_STATUS.propertyName(), + InventoryStatus.IGNORED.name()); + + return createResourceSearchView(PAGE_IGNORED_RESOURCES, initialCriteria); + } + }); + NavigationItem downServersItem = new NavigationItem(PAGE_UNAVAIL_SERVERS, new ViewFactory() { public Canvas createView() { Criteria initialCriteria = new Criteria(ResourceDataSourceField.AVAILABILITY.propertyName(), @@ -202,7 +214,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { });
return new NavigationSection(RESOURCES_SECTION_VIEW_ID, autodiscoveryQueueItem, allResourcesItem, - platformsItem, topLevelServersItem, serversItem, servicesItem, downServersItem); + platformsItem, topLevelServersItem, serversItem, servicesItem, ignoredResourcesItem, downServersItem); }
private NavigationSection buildGroupsSection() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java index 81c9bb0..ee0ed12 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java @@ -26,6 +26,7 @@ import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceD import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.CATEGORY; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.CTIME; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.DESCRIPTION; +import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.INVENTORY_STATUS; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.ITIME; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.KEY; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.LOCATION; @@ -52,6 +53,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; @@ -183,6 +185,7 @@ public class ResourceCompositeDataSource extends RPCDataSource<ResourceComposite criteria.addFilterName(getFilter(request, NAME.propertyName(), String.class)); criteria.addFilterResourceTypeId(getFilter(request, TYPE.propertyName(), Integer.class)); criteria.addFilterPluginName(getFilter(request, PLUGIN.propertyName(), String.class)); + criteria.addFilterInventoryStatus(getFilter(request, INVENTORY_STATUS.propertyName(), InventoryStatus.class)); criteria.addFilterTagNamespace(getFilter(request, "tagNamespace", String.class)); criteria.addFilterTagSemantic(getFilter(request, "tagSemantic", String.class)); criteria.addFilterTagName(getFilter(request, "tagName", String.class)); @@ -221,6 +224,7 @@ public class ResourceCompositeDataSource extends RPCDataSource<ResourceComposite record.setAttribute(ITIME.propertyName(), res.getItime()); record.setAttribute(MTIME.propertyName(), res.getMtime()); record.setAttribute(MODIFIER.propertyName(), res.getModifiedBy()); + record.setAttribute(INVENTORY_STATUS.propertyName(), res.getInventoryStatus());
record.setAttribute("resourcePermission", from.getResourcePermission());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java index 8ec2ece..d54b857 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java @@ -54,7 +54,9 @@ public enum ResourceDataSourceField {
MTIME("mtime", CoreGUI.getMessages().dataSource_resources_field_lastModifiedTime()),
- MODIFIER("modifiedBy", CoreGUI.getMessages().dataSource_resources_field_lastModifier()); + MODIFIER("modifiedBy", CoreGUI.getMessages().dataSource_resources_field_lastModifier()), + + INVENTORY_STATUS("inventoryStatus", CoreGUI.getMessages().common_title_inventoryStatus());
/** * Corresponds to a property name of Resource (e.g. resourceType.name). diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java index 6bd323e..8025a0b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java @@ -22,6 +22,7 @@ import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceD import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.CATEGORY; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.CTIME; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.DESCRIPTION; +import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.INVENTORY_STATUS; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.ITIME; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.KEY; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.LOCATION; @@ -50,6 +51,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; @@ -147,6 +149,11 @@ public class ResourceDatasource extends RPCDataSource<Resource, ResourceCriteria availabilityDataField.setCanEdit(false); fields.add(availabilityDataField);
+ DataSourceTextField inventoryStatusDataField = new DataSourceTextField(INVENTORY_STATUS.propertyName(), + INVENTORY_STATUS.title()); + inventoryStatusDataField.setDetail(true); + fields.add(inventoryStatusDataField); + DataSourceTextField ctimeDataField = new DataSourceTextField(CTIME.propertyName(), CTIME.title()); ctimeDataField.setDetail(true); fields.add(ctimeDataField); @@ -250,6 +257,7 @@ public class ResourceDatasource extends RPCDataSource<Resource, ResourceCriteria criteria.addFilterName(getFilter(request, NAME.propertyName(), String.class)); criteria.addFilterResourceTypeId(getFilter(request, TYPE.propertyName(), Integer.class)); criteria.addFilterPluginName(getFilter(request, PLUGIN.propertyName(), String.class)); + criteria.addFilterInventoryStatus(getFilter(request, INVENTORY_STATUS.propertyName(), InventoryStatus.class)); criteria.addFilterTagNamespace(getFilter(request, "tagNamespace", String.class)); criteria.addFilterTagSemantic(getFilter(request, "tagSemantic", String.class)); criteria.addFilterTagName(getFilter(request, "tagName", String.class)); @@ -300,6 +308,7 @@ public class ResourceDatasource extends RPCDataSource<Resource, ResourceCriteria record.setAttribute(ITIME.propertyName(), from.getItime()); record.setAttribute(MTIME.propertyName(), from.getMtime()); record.setAttribute(MODIFIER.propertyName(), from.getModifiedBy()); + record.setAttribute(INVENTORY_STATUS.propertyName(), from.getInventoryStatus());
record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, from.getAncestry()); record.setAttribute(AncestryUtil.RESOURCE_TYPE_ID, from.getResourceType().getId()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java index 3e1c6cd..0d1a6f5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java @@ -22,6 +22,7 @@ import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceD import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.CATEGORY; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.CTIME; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.DESCRIPTION; +import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.INVENTORY_STATUS; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.ITIME; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.KEY; import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.LOCATION; @@ -563,6 +564,10 @@ public class ResourceSearchView extends Table { ListGridField modifiedByField = new ListGridField(MODIFIER.propertyName(), MODIFIER.title(), 100); fields.add(modifiedByField);
+ ListGridField inventoryStatusField = new ListGridField(INVENTORY_STATUS.propertyName(), + INVENTORY_STATUS.title(), 100); + fields.add(inventoryStatusField); + return fields; }
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 4a130e8..dc5aa12 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 @@ -173,6 +173,7 @@ common_title_id_parent = Parent ID common_title_in_compliance = In Compliance? common_title_interval = Interval common_title_inventory = Inventory +common_title_inventoryStatus = Inventory Status common_title_inventorySummary = Inventory Summary common_title_kind = Kind common_title_lastUpdated = Last Updated @@ -1673,6 +1674,7 @@ view_inventory_groups_deleteFailed = Failed to delete the selected resource grou view_inventory_groups_deleteSuccessful = You have successfully deleted the selected resource groups view_inventory_groups_descendants = Descendants view_inventory_groups_loadFailed = Failed to load group composite data +view_inventory_ignoredResources = Ignored Resources view_inventory_mixed = mixed view_inventory_platforms = Platforms view_inventory_problemGroups = Problem Groups diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index 56d608f..9e388c0 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -197,6 +197,7 @@ common_title_id_parent = ID rodiče common_title_in_compliance = V cajku? common_title_interval = Interval common_title_inventory = Inventář +common_title_inventoryStatus = Stav inventarizace common_title_inventorySummary = Shrnutí inventáře common_title_kind = Druh common_title_lastUpdated = Naposledy modifikováno @@ -1687,6 +1688,7 @@ view_inventory_groups_deleteFailed = Nepodařilo se smazat vybrané skupiny zdro view_inventory_groups_deleteSuccessful = Úspěšně jste smazali vybrané skupiny zdrojů view_inventory_groups_descendants = Potomci view_inventory_groups_loadFailed = Nepodařilo se načíst složená data pro skupinu +##view_inventory_ignoredResources = Ignored Resources view_inventory_mixed = smíšené view_inventory_platforms = Platformy view_inventory_problemGroups = Problémové skupiny diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index fc69fc9..5edd2a6 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -174,6 +174,7 @@ common_title_id = ID common_title_id_parent = ID des Vaters common_title_interval = Intervall common_title_inventory = Inventar +common_title_inventoryStatus = Inventar-Status common_title_inventorySummary = Inventar Zusammenfassung common_title_kind = Art common_title_lastUpdated = Zuletzt aktualisiert @@ -1470,6 +1471,7 @@ view_inventory_groups_children = Kinder ##view_inventory_groups_deleteSuccessful = You have successfully deleted the selected resource groups ##view_inventory_groups_descendants = Descendants ##view_inventory_groups_loadFailed = Failed to load group composite data +##view_inventory_ignoredResources = Ignored Resources view_inventory_mixed = gemischt view_inventory_platforms = Platformen view_inventory_problemGroups = Gruppen mit Problemen diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 9ce350c..6807c15 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -176,6 +176,7 @@ common_title_id_parent = 親のID common_title_in_compliance = 順守しているか? common_title_interval = 間隔 common_title_inventory = インベントリ +common_title_inventoryStatus = インベントリステータス common_title_inventorySummary = インベントリサマリ common_title_kind = 種類 common_title_lastUpdated = 最終更新 @@ -1659,6 +1660,7 @@ view_inventory_groups_deleteFailed = 選択されたリソースグループの view_inventory_groups_deleteSuccessful = 選択されたリソースグループの削除に成功しました view_inventory_groups_descendants = 子孫 view_inventory_groups_loadFailed = グループ合成データのロードに失敗しました +##view_inventory_ignoredResources = Ignored Resources view_inventory_mixed = 混成 view_inventory_platforms = プラットフォーム view_inventory_problemGroups = 問題グループ diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties index ce50a7d..f19b749 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties @@ -164,6 +164,7 @@ common_title_id_parent = 부모ID common_title_in_compliance = 준수여부 common_title_interval = 간격 common_title_inventory = 인벤토리 +common_title_inventoryStatus = 인벤토리 상태 common_title_inventorySummary = 인벤토리 요약 common_title_ldapGroups = LDAP 그룹 common_title_members_reporting = 멤버 리포트 @@ -1383,6 +1384,7 @@ view_inventory_groups_deleteFailed = 선택된 리소스 그룹 삭제에 실패 view_inventory_groups_deleteSuccessful = 선택된 리소스 그룹 삭제에 성공했습니다 view_inventory_groups_descendants = 자손 view_inventory_groups_loadFailed = 그룹 합성 데이터 로드에 실패했습니다 +##view_inventory_ignoredResources = Ignored Resources view_inventory_mixed = 혼성 view_inventory_platforms = 플랫폼 view_inventory_problemGroups = 문제 그룹 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index af2453a..9dd698f 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -173,6 +173,7 @@ common_title_id = ID common_title_id_parent = ID do Recurso pai ##common_title_interval = Interval common_title_inventory = Invent\u00E1rio +common_title_inventoryStatus = Status do Invet\u00E1rio common_title_inventorySummary = Sum\u00E1rio do Invent\u00E1rio ##common_title_kind = Kind common_title_lastUpdated = \u00DAltima Atualiza\u00E7\u00E3o @@ -1684,6 +1685,7 @@ view_inventory_groups_deleteFailed = Failed to delete the selected resource grou view_inventory_groups_deleteSuccessful = You have successfully deleted the selected resource groups view_inventory_groups_descendants = Descendants view_inventory_groups_loadFailed = Failed to load group composite data +##view_inventory_ignoredResources = Ignored Resources view_inventory_mixed = mixed view_inventory_platforms = Platforms view_inventory_problemGroups = Problem Groups diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index 94ea235..2a856bb 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -2274,6 +2274,7 @@ common_title_id = ID common_title_id_parent = Родительский ID common_title_interval = Интервал common_title_inventory = Инвентарь +##common_title_inventoryStatus = Inventory Status common_title_inventorySummary = Итог инвентаризации common_title_lastUpdated = Последнее обновление common_title_lastUpdatedBy = Последнее обновление от @@ -2658,6 +2659,7 @@ view_admin_systemSettings_LDAPBindDN_name = Имя пользователя view_admin_systemSettings_LDAPBindPW_name = Пароль ##view_alert_details_field_resource_ancestry = Resource Ancestry ##view_alert_details_field_watched_resource = Watched Resource +##view_autoDiscoveryQ_field_inventoryStatus = Inventory Status ##view_autoDiscoveryQ_ignore = Ignore ##view_bundle_revertWizard_getInfoStep_revertDeployDescFull = [REVERT From] {0} [REVERT To] {1} ##view_configEdit_description = Description @@ -2676,6 +2678,7 @@ view_admin_systemSettings_LDAPBindPW_name = Пароль ##view_group_detail_failRecursiveChange = Failed to update the recursive setting for group [{0}] view_group_detail_implicitAvail = Group availability for all members (includes recursive members). ##view_group_detail_recursiveChange = You successfully changed the recursive setting for group [{0}] +##view_inventory_ignoredResources = Ignored Resources ##view_inventory_resources_disableSuccessful = You have successfully disabled the selected resources and their children, [{0}] resources. ##view_inventory_resources_ignoreConfirm = Are you sure you want the selected resources to be ignored? They will no longer show up in inventory. ##view_inventory_resources_ignoreFailed = Failed to ignore Resources diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 7e43435..c34723f 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -170,6 +170,7 @@ common_title_host = \u4e3b\u673a common_title_id = ID common_title_id_parent = \u7236ID common_title_inventory = \u6e05\u5355 +common_title_inventoryStatus = \u6e05\u5355\u72b6\u6001 common_title_inventorySummary = \u6e05\u5355\u6c47\u603b ##common_title_kind = Kind common_title_lastUpdated = \u6700\u8fd1\u66f4\u65b0 @@ -1660,6 +1661,7 @@ view_inventory_groups_deleteFailed = \u5220\u9664\u6307\u5b9a\u7684\u8d44\u6e90\ view_inventory_groups_deleteSuccessful = \u6210\u529f\u7684\u5220\u9664\u6307\u5b9a\u7684\u8d44\u6e90\u7ec4 view_inventory_groups_descendants = \u540e\u4ee3\u7ec4 view_inventory_groups_loadFailed = \u52a0\u8f7d\u7ec4\u7ec4\u5408\u6570\u636e\u5931\u8d25 +##view_inventory_ignoredResources = Ignored Resources view_inventory_mixed = \u6df7\u5408 view_inventory_platforms = \u5e73\u53f0 view_inventory_problemGroups = \u95ee\u9898\u7ec4
rhq-commits@lists.fedorahosted.org