modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
| 8 ++++++++
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 4 +++-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
| 5 +++--
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
| 4 +++-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
| 4 +++-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
| 4 +++-
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
| 2 ++
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
| 2 ++
8 files changed, 27 insertions(+), 6 deletions(-)
New commits:
commit 965b7d821a28dde377e2696236ffdd1808883cea
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Fri Jun 1 13:44:11 2012 +0200
[BZ 805503 - Recently triggered alerts report does not show resource in details view]
Resource name and resource ancestry form fields have been added.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
index 361be3c..296b22e 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
@@ -183,6 +183,14 @@ public class AlertDetailsView extends LocatableVLayout implements
BookmarkableVi
StaticTextItem recoveryItem = new StaticTextItem("recovery",
MSG.view_alert_details_field_recovery_info());
recoveryItem.setValue(record.getAttribute("recoveryInfo"));
items.add(recoveryItem);
+
+ StaticTextItem resourceItem = new StaticTextItem("resourceName",
MSG.view_alert_details_field_watched_resource());
+ resourceItem.setValue(record.getAttribute("resourceName"));
+ items.add(resourceItem);
+
+ StaticTextItem resourceAncestryItem = new
StaticTextItem("resourceAncestry",
MSG.view_alert_details_field_resource_ancestry());
+
resourceAncestryItem.setValue(record.getAttribute("resourceAncestry"));
+ items.add(resourceAncestryItem);
form.setItems(items.toArray(new FormItem[items.size()]));
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 eeeefb0..d1a9b90 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
@@ -922,6 +922,8 @@ view_alert_definitions_update_success = Alert definition successfully
updated
view_alert_details_field_ack_at = Acknowledged at
view_alert_details_field_ack_by = Acknowledged by
view_alert_details_field_recovery_info = Recovery Info
+view_alert_details_field_resource_ancestry = Resource Ancestry
+view_alert_details_field_watched_resource = Watched Resource
view_alert_details_loadFailed = Failed to fetch alert details
view_alerts_ack_confirm = Acknowledge the selected alert(s)?
view_alerts_ack_confirm_all = Acknowledge all alerts from this source?
@@ -2016,8 +2018,8 @@ widget_resourceFactoryWizard_infoStepName = Resource Information
widget_resourceFactoryWizard_infoStep_loadFail = Failed to get available Architectures
widget_resourceFactoryWizard_namePrompt = New Resource Name
widget_resourceFactoryWizard_templatePrompt = Connection Settings Template
-widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override
the default timeout for child resource creation (on the {0} Agent). The default timeout is
set to 60 seconds. Useful for particularly long create actions, like deployment of a large
application. Usually used if a previous attempt suffered a timeout failure.
widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that
the deployment may still succeed.
+widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override
the default timeout for child resource creation (on the {0} Agent). The default timeout is
set to 60 seconds. Useful for particularly long create actions, like deployment of a large
application. Usually used if a previous attempt suffered a timeout failure.
widget_resourceFactoryWizard_uploadFailure = Failed to upload file
widget_resourceFactoryWizard_uploadFileStepName = Upload Resource Content File
widget_resourceFactoryWizard_uploadInProgress = The upload is in progress... This can
take several minutes to complete for large distribution files.
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 8797465..88b9e87 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
@@ -18,7 +18,6 @@
# * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# */
#
-
# suppress inspection "UnusedProperty" for whole file
#
# RHQ GUI i18n Messages - Locale: CS
@@ -941,6 +940,8 @@ view_alert_definitions_update_success = Úspěšně změněna definice
výstrahy
view_alert_details_field_ack_at = Potvrzeno v
view_alert_details_field_ack_by = Potvrzeno kým
view_alert_details_field_recovery_info = Informace o obnově
+view_alert_details_field_resource_ancestry = Původ zdroje
+view_alert_details_field_watched_resource = Sledovaný zdroj
view_alert_details_loadFailed = Nepodařilo se načíst výstrahy
view_alerts_ack_confirm = Potvrdit vybrané výstrahy?
view_alerts_ack_confirm_all = Potvrdit všechny výstrahy tohoto zdroje?
@@ -2035,8 +2036,8 @@ widget_resourceFactoryWizard_infoStepName = Informace o zdroji
widget_resourceFactoryWizard_infoStep_loadFail = Nepodařilo se získat dostupné
architektury
widget_resourceFactoryWizard_namePrompt = Nové jméno zdroje
widget_resourceFactoryWizard_templatePrompt = Šablona pro nastavení připojení
-##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will
override the default timeout for child resource creation (on the {0} Agent). The default
timeout is set to 60 seconds. Useful for particularly long create actions, like deployment
of a large application. Usually used if a previous attempt suffered a timeout failure.
##widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that
the deployment may still succeed.
+##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will
override the default timeout for child resource creation (on the {0} Agent). The default
timeout is set to 60 seconds. Useful for particularly long create actions, like deployment
of a large application. Usually used if a previous attempt suffered a timeout failure.
widget_resourceFactoryWizard_uploadFailure = Nepodařilo se nahrát soubor
widget_resourceFactoryWizard_uploadFileStepName = Nahrát obsah souboru zdroje
widget_resourceFactoryWizard_uploadInProgress = Upload právě probíhá... Může to trvat
několik minut.
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 e47bcdb..cfde9eb 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
@@ -803,6 +803,8 @@ view_alert_definitions_update_success = Alarm-Definition erfolgreich
aktualisier
view_alert_details_field_ack_at = Bestätigt um
view_alert_details_field_ack_by = Bestätigt durch
view_alert_details_field_recovery_info = Info zur Erholung
+##view_alert_details_field_resource_ancestry = Resource Ancestry
+##view_alert_details_field_watched_resource = Watched Resource
view_alert_details_loadFailed = Laden der Details für den Alarm fehlgeschlagen
view_alerts_ack_confirm = Die ausgewählten Alarme bestätigen?
view_alerts_ack_confirm_all = Alle Alarme dieser Quelle bestätigen?
@@ -1777,8 +1779,8 @@ widget_resourceFactoryWizard_infoStepName = Information über die
Ressource
widget_resourceFactoryWizard_infoStep_loadFail = Konnte die verfügbaren Architekturen
nicht ermitteln
widget_resourceFactoryWizard_namePrompt = Name der neuen Ressource
widget_resourceFactoryWizard_templatePrompt = Vorlage für die Verbindungseinstellungen
-widget_resourceFactoryWizard_uploadFailure = Konnte die Datei nicht hochladen
##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will
override the default timeout for child resource creation (on the {0} Agent). The default
timeout is set to 60 seconds. Useful for particularly long create actions, like deployment
of a large application. Usually used if a previous attempt suffered a timeout failure.
+widget_resourceFactoryWizard_uploadFailure = Konnte die Datei nicht hochladen
###widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that
the deployment may still succeed.
##widget_resourceFactoryWizard_uploadFileStepName = Upload Resource Content File
##widget_resourceFactoryWizard_uploadInProgress = The upload is in progress... This can
take several minutes to complete for large distribution files.
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 ee72bd8..b5bc116 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
@@ -916,6 +916,8 @@ view_alert_definitions_update_success = アラート定義の更新に成功し
view_alert_details_field_ack_at = 次の場所で確認済みです
view_alert_details_field_ack_by = 次の人によって確認済みです
view_alert_details_field_recovery_info = リカバリ情報
+##view_alert_details_field_resource_ancestry = Resource Ancestry
+##view_alert_details_field_watched_resource = Watched Resource
view_alert_details_loadFailed = アラートの詳細を取り出すのに失敗しました
view_alerts_ack_confirm = 選択されたアラートを確認しますか?
view_alerts_ack_confirm_all = このソースからすべてのアラートを確認しますか?
@@ -2005,8 +2007,8 @@ widget_resourceFactoryWizard_infoStepName = リソース情報
widget_resourceFactoryWizard_infoStep_loadFail = アーキテクチャーを利用可能にするのに失敗しました
widget_resourceFactoryWizard_namePrompt = 新規リソース名
widget_resourceFactoryWizard_templatePrompt = コネクション設定テンプレート
-##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will
override the default timeout for child resource creation (on the {0} Agent). The default
timeout is set to 60 seconds. Useful for particularly long create actions, like deployment
of a large application. Usually used if a previous attempt suffered a timeout failure.
###widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that
the deployment may still succeed.
+##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will
override the default timeout for child resource creation (on the {0} Agent). The default
timeout is set to 60 seconds. Useful for particularly long create actions, like deployment
of a large application. Usually used if a previous attempt suffered a timeout failure.
widget_resourceFactoryWizard_uploadFailure = ファイルアップロードの失敗
widget_resourceFactoryWizard_uploadFileStepName = リソースコンテントファイルのアップロード
widget_resourceFactoryWizard_uploadInProgress = アップロードは処理中です...
大きなファイルを配布するには数分かかることもあります。
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 c8afbd8..91345f5 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
@@ -923,6 +923,8 @@ view_alert_details_breadcrumb = Detalhes
view_alert_details_field_ack_at = Verificado em
view_alert_details_field_ack_by = Verificado por
view_alert_details_field_recovery_info = Informa\u00E7\u00E3o de Recupera\u00E7\u00E3o
+##view_alert_details_field_resource_ancestry = Resource Ancestry
+##view_alert_details_field_watched_resource = Watched Resource
view_alert_details_loadFailed = Falha ao recuperar detalhes do alerta
view_alerts_ack_confirm = Confirma o(s) alerta(s) selecionado(s)?
view_alerts_ack_confirm_all = Confirma todos os alertas?
@@ -2118,8 +2120,8 @@ widget_resourceFactoryWizard_infoStepName = Informa\u00E7\u00E3o do
Recurso
widget_resourceFactoryWizard_infoStep_loadFail = Falha ao recuperar Arquiteturas
dispon\u00EDveis.
widget_resourceFactoryWizard_namePrompt = Novo Nome do Recurso
widget_resourceFactoryWizard_templatePrompt = Modelo de Propriedades para Conex\u00E3o
-##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will
override the default timeout for child resource creation (on the {0} Agent). The default
timeout is set to 60 seconds. Useful for particularly long create actions, like deployment
of a large application. Usually used if a previous attempt suffered a timeout failure.
##widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that
the deployment may still succeed.
+##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will
override the default timeout for child resource creation (on the {0} Agent). The default
timeout is set to 60 seconds. Useful for particularly long create actions, like deployment
of a large application. Usually used if a previous attempt suffered a timeout failure.
widget_resourceFactoryWizard_uploadFailure = Falha ao realizar o upload do arquivo
widget_resourceFactoryWizard_uploadFileStepName = Upload do Arquivo do Recurso
widget_resourceFactoryWizard_uploadInProgress = Upload em andamento... Esse processo pode
demorar alguns minutos para ser finalizado em caso de arquivos muito grandes.
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 2692287..361f831 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
@@ -2445,5 +2445,7 @@ view_admin_downloads_cli_link_value = Загрузить CLI {0} ({1})
view_admin_downloads_cli_loadError = Не удалось получить версию CLI
view_admin_downloads_cli_md5 = CLI MD5
view_admin_downloads_cli_version = Версия CLI
+##view_alert_details_field_resource_ancestry = Resource Ancestry
+##view_alert_details_field_watched_resource = Watched Resource
##view_bundle_revertWizard_getInfoStep_revertDeployDescFull = [REVERT From] {0} [REVERT
To] {1}
##view_messageCenter_messageRootCause = Root Cause
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 9453ba2..08e15fd 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
@@ -910,6 +910,8 @@ view_alert_definitions_update_success =
\u544a\u8b66\u5b9a\u4e49\u66f4\u65b0\u62
view_alert_details_field_ack_at = \u786e\u8ba4\u4e8e
view_alert_details_field_ack_by = \u786e\u8ba4\u8005
view_alert_details_field_recovery_info = \u8fd8\u539f\u4fe1\u606f
+##view_alert_details_field_resource_ancestry = Resource Ancestry
+##view_alert_details_field_watched_resource = Watched Resource
view_alert_details_loadFailed = \u53d6\u5f97\u544a\u8b66\u8be6\u60c5\u5931\u8d25
view_alerts_ack_confirm = \u786e\u8ba4\u9009\u62e9\u7684\u544a\u8b66(s)?
view_alerts_ack_confirm_all =
\u4ece\u8fd9\u4e2a\u6e90\u4e0a\u786e\u8ba4\u6240\u6709\u544a\u8b66?