modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java | 6 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java | 9 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java | 51 ++++++---- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertDefinitionGWTService.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java | 18 ++- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java | 27 +++-- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java | 23 ++++ 16 files changed, 108 insertions(+), 39 deletions(-)
New commits: commit 3ef61c1860a590b16b461b81f85b0011b2ee620d Author: Jirka Kremser jkremser@redhat.com Date: Mon May 20 13:36:45 2013 +0200
[BZ 958169] - Modified alert definition is not saved on confirming the save message after clicking on 'Back to List' button - New method for creating an alert definitions was added to SLSB, because the UI requires the ids of newly created alert conditions.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java index b90b209..8fe6d4b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionEditor.java @@ -140,7 +140,7 @@ public class ConditionEditor extends EnhancedVLayout { private AlertCondition existingCondition;
public ConditionEditor(HashSet<AlertCondition> conditions, Map<Integer, AlertCondition> modifiedConditions, - SelectItem conditionExpression, ResourceType rtype, Runnable closeFunc, AlertCondition existingCondition) { + SelectItem conditionExpression, ResourceType rtype, AlertCondition existingCondition, Runnable closeFunc) { super(); this.editMode = existingCondition != null; this.existingCondition = existingCondition; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java index 782e4b5..8f4a36f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java @@ -196,7 +196,7 @@ public class ConditionsEditor extends EnhancedVLayout { } });
- table.addTableAction(MSG.common_button_edit(), null, new AbstractTableAction(TableActionEnablement.SINGLE) { + table.addTableAction(MSG.view_alert_definition_editCondition(), null, new AbstractTableAction(TableActionEnablement.SINGLE) { public void executeAction(ListGridRecord[] selection, Object actionValue) { AlertCondition condition = getDataSource().copyValues(selection[0]); showConditionEditor(condition); @@ -252,7 +252,7 @@ public class ConditionsEditor extends EnhancedVLayout { final int numConditions = conditions.size(); final ConditionEditor newConditionEditor = new ConditionEditor(conditions, modifiedConditions, ConditionsEditor.this.conditionExpression, ConditionsEditor.this.resourceType, - new Runnable() { + existingCondition, new Runnable() { @Override public void run() { updated = updated || numConditions != conditions.size() @@ -260,7 +260,7 @@ public class ConditionsEditor extends EnhancedVLayout { winModal.markForDestroy(); refresh(); } - }, existingCondition); + }); winModal.addItem(newConditionEditor); winModal.show(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java index 2cbe8c6..d69f7f4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java @@ -197,15 +197,14 @@ public class ResourceAlertDefinitionsView extends AbstractAlertDefinitionsView { protected void commitAlertDefinition(final AlertDefinition alertDefinition, boolean purgeInternals, final AsyncCallback<AlertDefinition> resultReceiver) { if (alertDefinition.getId() == 0) { - GWTServiceLookup.getAlertDefinitionService().createAlertDefinition(alertDefinition, - Integer.valueOf(resource.getId()), new AsyncCallback<Integer>() { + GWTServiceLookup.getAlertDefinitionService().createAlertDefinitionAndReturn(alertDefinition, + Integer.valueOf(resource.getId()), new AsyncCallback<AlertDefinition>() { @Override - public void onSuccess(Integer result) { + public void onSuccess(AlertDefinition result) { CoreGUI.getMessageCenter().notify( new Message(MSG.view_alert_definitions_create_success(), Severity.Info)); - alertDefinition.setId(result.intValue()); ResourceAlertDefinitionsView.this.refresh(); - resultReceiver.onSuccess(alertDefinition); + resultReceiver.onSuccess(result); }
@Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java index c86d0cd..25742f5 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java @@ -146,10 +146,7 @@ public class SingleAlertDefinitionView extends EnhancedVLayout { cancelButton.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { - if (handlerRegistration != null) - handlerRegistration.removeHandler(); - // enable the back button - ((EnhancedVLayout) getParentElement()).getMember("backButton").setDisabled(false); + unregisterHandler(); setAlertDefinition(getAlertDefinition()); // reverts data back to original makeViewOnly(); } @@ -159,6 +156,15 @@ public class SingleAlertDefinitionView extends EnhancedVLayout { addMember(tabSet); addMember(buttons); } + + @Override + protected void onDraw() { + super.onDraw(); + if (alertDefinition == null || alertDefinition.getId() == 0) { + // disable the back button when creating new definition + setBackButtonDisabled(true); + } + }
public AlertDefinition getAlertDefinition() { return alertDefinition; @@ -197,8 +203,7 @@ public class SingleAlertDefinitionView extends EnhancedVLayout { recovery.makeEditable(); dampening.makeEditable();
- if (handlerRegistration != null) - handlerRegistration.removeHandler(); + unregisterHandler(); handlerRegistration = addVisibilityChangedHandler(new VisibilityChangedHandler() { public void onVisibilityChanged(VisibilityChangedEvent event) { if (!event.getIsVisible()) { @@ -207,15 +212,13 @@ public class SingleAlertDefinitionView extends EnhancedVLayout { if (value) { save(); } - if (handlerRegistration != null) - handlerRegistration.removeHandler(); } }); } } }); // disable the back button - ((EnhancedVLayout) getParentElement()).getMember("backButton").setDisabled(true); + setBackButtonDisabled(true); }
public void makeViewOnly() { @@ -228,6 +231,7 @@ public class SingleAlertDefinitionView extends EnhancedVLayout { notifications.makeViewOnly(); recovery.makeViewOnly(); dampening.makeViewOnly(); + setBackButtonDisabled(false); }
public void saveAlertDefinition() { @@ -249,20 +253,13 @@ public class SingleAlertDefinitionView extends EnhancedVLayout { new AsyncCallback<AlertDefinition>() { @Override public void onSuccess(final AlertDefinition alertDef) { - if (handlerRegistration != null) - handlerRegistration.removeHandler(); setAlertDefinition(alertDef); - // enable the back button - ((EnhancedVLayout) getParentElement()).getMember("backButton").setDisabled(false); + unregisterHandler(); }
@Override public void onFailure(Throwable caught) { - if (handlerRegistration != null) - handlerRegistration.removeHandler(); - // enable the back button - ((EnhancedVLayout) getParentElement()).getMember("backButton").setDisabled(false); - + unregisterHandler(); // no error handling, the notification is done in the subclasses of AbstractAlertDefinitionsView } }); @@ -270,4 +267,22 @@ public class SingleAlertDefinitionView extends EnhancedVLayout { tabSet.selectTab(generalPropertiesTab); } } + + private void setBackButtonDisabled(boolean enabled) { + Canvas layoutCandidate = getParentElement(); + if (layoutCandidate instanceof EnhancedVLayout) { + EnhancedVLayout parentLayout = (EnhancedVLayout) getParentElement(); + Canvas backButton = parentLayout.getMember("backButton"); + if (backButton != null) { + backButton.setDisabled(enabled); + } + } + } + + private void unregisterHandler() { + if (handlerRegistration != null) { + handlerRegistration.removeHandler(); + handlerRegistration = null; + } + } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertDefinitionGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertDefinitionGWTService.java index 0921b2b..794a67f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertDefinitionGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertDefinitionGWTService.java @@ -32,6 +32,9 @@ public interface AlertDefinitionGWTService extends RemoteService {
int createAlertDefinition(AlertDefinition alertDefinition, Integer resourceId) throws RuntimeException;
+ AlertDefinition createAlertDefinitionAndReturn(AlertDefinition alertDefinition, Integer resourceId) + throws RuntimeException; + AlertDefinition updateAlertDefinition(int alertDefinitionId, AlertDefinition alertDefinition, boolean purgeInternals) throws RuntimeException;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java index 181eef5..da1d981 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java @@ -66,8 +66,18 @@ public class AlertDefinitionGWTServiceImpl extends AbstractGWTServiceImpl implem @Override public int createAlertDefinition(AlertDefinition alertDefinition, Integer resourceId) throws RuntimeException { try { - int results = alertDefManager.createAlertDefinitionInNewTransaction(getSessionSubject(), alertDefinition, resourceId, true); - return results; + int result = alertDefManager.createAlertDefinitionInNewTransaction(getSessionSubject(), alertDefinition, resourceId, true); + return result; + } catch (Throwable t) { + throw getExceptionToThrowToClient(t); + } + } + + @Override + public AlertDefinition createAlertDefinitionAndReturn(AlertDefinition alertDefinition, Integer resourceId) throws RuntimeException { + try { + AlertDefinition result = alertDefManager.createAlertDefinitionAndRerurnIt(getSessionSubject(), alertDefinition, resourceId, true); + return SerialUtility.prepare(result, "createAlertDefinitionAndReturn"); } catch (Throwable t) { throw getExceptionToThrowToClient(t); } @@ -77,9 +87,9 @@ public class AlertDefinitionGWTServiceImpl extends AbstractGWTServiceImpl implem public AlertDefinition updateAlertDefinition(int alertDefinitionId, AlertDefinition alertDefinition, boolean resetMatching) throws RuntimeException { try { - AlertDefinition results = alertDefManager.updateAlertDefinition(getSessionSubject(), alertDefinitionId, + AlertDefinition result = alertDefManager.updateAlertDefinition(getSessionSubject(), alertDefinitionId, alertDefinition, resetMatching); - return SerialUtility.prepare(results, "updateAlertDefinition"); + return SerialUtility.prepare(result, "updateAlertDefinition"); } catch (Throwable t) { throw getExceptionToThrowToClient(t); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java index d00a969..8f8fec5 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java @@ -201,19 +201,30 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal, @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) public int createDependentAlertDefinition(Subject subject, AlertDefinition alertDefinition, int resourceId) throws InvalidAlertDefinitionException { - - return createAlertDefinitionInternal(subject, alertDefinition, resourceId, false, false); + AlertDefinition newAlertDefinition = createAlertDefinitionInternal(subject, alertDefinition, resourceId, false, + false); + return newAlertDefinition.getId(); }
@Override @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) - public int createAlertDefinitionInNewTransaction(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean validateNotificationConfiguration) - throws InvalidAlertDefinitionException { - - return createAlertDefinitionInternal(subject, alertDefinition, resourceId, true, validateNotificationConfiguration); + public int createAlertDefinitionInNewTransaction(Subject subject, AlertDefinition alertDefinition, + Integer resourceId, boolean validateNotificationConfiguration) throws InvalidAlertDefinitionException { + AlertDefinition newAlertDefinition = createAlertDefinitionInternal(subject, alertDefinition, resourceId, true, + validateNotificationConfiguration); + return newAlertDefinition.getId(); + } + + @Override + @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) + public AlertDefinition createAlertDefinitionAndRerurnIt(Subject subject, AlertDefinition alertDefinition, + Integer resourceId, boolean validateNotificationConfiguration) throws InvalidAlertDefinitionException { + AlertDefinition newAlertDefinition = createAlertDefinitionInternal(subject, alertDefinition, resourceId, true, + validateNotificationConfiguration); + return newAlertDefinition; }
- private int createAlertDefinitionInternal(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean checkPerms, boolean validateNotificationConfiguration) throws InvalidAlertDefinitionException { + private AlertDefinition createAlertDefinitionInternal(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean checkPerms, boolean validateNotificationConfiguration) throws InvalidAlertDefinitionException { checkAlertDefinition(subject, null, alertDefinition, resourceId, validateNotificationConfiguration);
// if this is an resource alert definition, set up the link to a resource @@ -279,7 +290,7 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal, AlertDefinitionEvent.CREATED); }
- return alertDefinition.getId(); + return alertDefinition; }
private void fixRecoveryId(AlertDefinition definition) { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java index 5afa1f9..ee0e161 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java @@ -65,6 +65,29 @@ public interface AlertDefinitionManagerLocal { */ int createAlertDefinitionInNewTransaction(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean finalizeNotificationConfiguration) throws InvalidAlertDefinitionException; + + /** + * Creates a new alert definition. Note that the suject is checked to have necessary authz, which might not + * be what you want in all use cases. See {@link #createDependentAlertDefinition(Subject, AlertDefinition, int)} + * for further discussion of this. The only difference between + * {@link GroupAlertDefinitionManagerLocal#createAlertDefinitionInNewTransaction(Subject, AlertDefinition, Integer, boolean)} + * and this method is the return type. + * + * @param subject the user creating the alert definition + * @param alertDefinition the new alert definition to persist + * @param resourceId the resource id for which the def is being created + * @param finalizeNotificationConfiguration if true, the configuration of the def's notifications is validated. + * This is NOT what you want if, for example, you are merely creating a copy of an existing definition. + * Some notifications might require more input when creating the notification than is then persisted in their configs + * (prominent example being the CLI alert sender). + * This would then cause the validation to fail every time you created a copy of a definition and tried + * to persist it. Note that passing false AND having new, unpersisted notifications in the alert definition can + * lead to invalid configuration being stored for the notifications. + * @return the instance of newly created alert definition + * @throws InvalidAlertDefinitionException + */ + AlertDefinition createAlertDefinitionAndRerurnIt(Subject subject, AlertDefinition alertDefinition, + Integer resourceId, boolean validateNotificationConfiguration) throws InvalidAlertDefinitionException;
/** * This is exactly the same as {@link #createAlertDefinitionInNewTransaction(Subject, AlertDefinition, Integer, boolean)} but
commit b638cc12a5796b7ccb3789bf94768303b0ce0e3c Author: Jirka Kremser jkremser@redhat.com Date: Mon May 20 13:29:43 2013 +0200
[BZ 958169] - Modified alert definition is not saved on confirming the save message after clicking on 'Back to List' button - I18n (Instead of "Edit", now the button label says "Edit Condition").
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 00a68ef..b630706 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 @@ -977,6 +977,7 @@ view_alert_definition_condition_editor_option_metric_trait_change = Trait Value view_alert_definition_condition_editor_option_operation = Operation Execution view_alert_definition_condition_editor_option_resource_configuration = Resource Configuration Change view_alert_definition_condition_editor_resource_configuration_tooltip = This condition is triggered when the resource configuration changes. +view_alert_definition_editCondition = Edit Condition view_alert_definition_for_group = View Group Definition view_alert_definition_for_type = View Template view_alert_definition_notification_cliScript_editor_anotherUser = Another User 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 a27fb3c..cab205f 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 @@ -993,6 +993,7 @@ view_alert_definition_condition_editor_option_metric_trait_change = Změna hodno view_alert_definition_condition_editor_option_operation = Spuštění operace view_alert_definition_condition_editor_option_resource_configuration = Změna konfigurace zdroje view_alert_definition_condition_editor_resource_configuration_tooltip = Podmínka je splněna, když se změní konfigurace zdroje. +view_alert_definition_editCondition = Editovat podmínku view_alert_definition_for_group = Zobrazit definici skupiny view_alert_definition_for_type = Zobrazit šablonu view_alert_definition_notification_cliScript_editor_anotherUser = Jiný uživatel 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 902951d..057785a 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 @@ -883,6 +883,7 @@ view_alert_definition_condition_editor_option_metric_trait_change = Änderung de view_alert_definition_condition_editor_option_operation = Ausführung der Operation view_alert_definition_condition_editor_option_resource_configuration = Änderung der Konfiguration der Ressource ##view_alert_definition_condition_editor_resource_configuration_tooltip = This condition is triggered when the resource configuration changes. +##view_alert_definition_editCondition = Edit Condition view_alert_definition_for_group = Gruppendefinition ansehen view_alert_definition_for_type = Vorlage ansehen view_alert_definition_notification_cliScript_editor_anotherUser = Anderer Benutzer 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 8f47413..a929966 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 @@ -969,6 +969,7 @@ view_alert_definition_condition_editor_option_metric_trait_change = トレイト view_alert_definition_condition_editor_option_operation = オペレーションの実行 view_alert_definition_condition_editor_option_resource_configuration = リソース構成の変化 view_alert_definition_condition_editor_resource_configuration_tooltip = この条件はリソース構成が変更されると引き起こされます +##view_alert_definition_editCondition = Edit Condition view_alert_definition_for_group = ビューグループ定義 view_alert_definition_for_type = ビューテンプレート view_alert_definition_notification_cliScript_editor_anotherUser = 別のユーザー 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 5d19d06..da0a8a5 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 @@ -846,6 +846,7 @@ view_alert_definition_condition_editor_option_metric_threshold = 측정 절대 view_alert_definition_condition_editor_option_metric_trait_change = 특성값의 변화 view_alert_definition_condition_editor_option_resource_configuration = 자원 구성의 변화 view_alert_definition_condition_editor_resource_configuration_tooltip = 이 조건은 자원 구성이 변경되면 발생합니다. +##view_alert_definition_editCondition = Edit Condition view_alert_definition_for_group = 뷰 그룹 정의 view_alert_definition_notification_cliScript_editor_anotherUser = 다른 사용자 view_alert_definition_notification_cliScript_editor_existingScript = 기존의 스크립트 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 743c4b5..9f342d7 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 @@ -977,6 +977,7 @@ view_alert_definition_condition_editor_option_metric_trait_change = Mudan\u00E7a view_alert_definition_condition_editor_option_operation = Execu\u00E7\u00E3o de Opera\u00E7\u00E3o view_alert_definition_condition_editor_option_resource_configuration = Mudan\u00E7a na Configura\u00E7\u00E3o do Recurso view_alert_definition_condition_editor_resource_configuration_tooltip = Essa condi\u00E7\u00E3o \u00E9 disparada quando a configura\u00E7\u00E3o do recurso for alterada. +##view_alert_definition_editCondition = Edit Condition view_alert_definition_for_group = Visualizar Defini\u00E7\u00E3o de Grupo view_alert_definition_for_type = Visualizar Template view_alert_definition_notification_cliScript_editor_anotherUser = Another User 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 772c4e4..c8ee796 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 @@ -943,6 +943,7 @@ #view_alert_definition_condition_editor_option_operation = Operation Execution #view_alert_definition_condition_editor_option_resource_configuration = Resource Configuration Change #view_alert_definition_condition_editor_resource_configuration_tooltip = This condition is triggered when the resource configuration changes. +##view_alert_definition_editCondition = Edit Condition #view_alert_definition_for_group = View Group Definition #view_alert_definition_for_type = View Template #view_alert_definition_notification_cliScript_editor_anotherUser = Another User 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 03dfa4e..147b9f8 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 @@ -963,6 +963,7 @@ view_alert_definition_condition_editor_option_metric_trait_change = Trait Value view_alert_definition_condition_editor_option_operation = Operation Execution view_alert_definition_condition_editor_option_resource_configuration = \u8d44\u6e90\u914d\u7f6e\u6539\u53d8 view_alert_definition_condition_editor_resource_configuration_tooltip = This condition is triggered when the resource configuration changes. +##view_alert_definition_editCondition = Edit Condition view_alert_definition_for_group = \u67e5\u770b\u7ec4\u5b9a\u4e49 view_alert_definition_for_type = \u67e5\u770b\u6a21\u677f view_alert_definition_notification_cliScript_editor_anotherUser = \u5176\u4ed6\u7528\u6237
rhq-commits@lists.fedorahosted.org