modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
| 8 ++++++--
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 5 +++--
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
| 5 +++--
3 files changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 2d946f73b28448292974c8d2ee9058a35c523301
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Aug 28 11:59:26 2013 +0200
BZ 1001701 - validate the recalculation interval in the UI before trying to submit.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
index 7b36717..748232b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
@@ -56,6 +56,7 @@ import com.smartgwt.client.widgets.form.fields.events.ChangedEvent;
import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
import com.smartgwt.client.widgets.form.fields.events.FormItemClickHandler;
import com.smartgwt.client.widgets.form.fields.events.FormItemIconClickEvent;
+import com.smartgwt.client.widgets.form.validator.IsIntegerValidator;
import com.smartgwt.client.widgets.form.validator.RegExpValidator;
import com.smartgwt.client.widgets.form.validator.Validator;
import com.smartgwt.client.widgets.grid.CellFormatter;
@@ -137,8 +138,11 @@ public class SingleGroupDefinitionView extends EnhancedVLayout
implements Bookma
recursive.setValue(groupDefinition.isRecursive());
description.setValue(groupDefinition.getDescription());
recalculationInterval.setValue(groupDefinition.getRecalculationInterval() / (60 *
1000));
+ Validator intervalValidator = new IsIntegerValidator();
+
intervalValidator.setErrorMessage(MSG.view_dynagroup_recalculationInterval_error());
+ recalculationInterval.setValidators(intervalValidator);
expression.setValue(groupDefinition.getExpression());
-
+
Validator nameValidator = new
RegExpValidator("^[^\\<\\$\\'\\{\\[]{1,100}$");
nameValidator.setErrorMessage("Name must not contain following characters:
< $ ' [ {");
name.setValidators(nameValidator);
@@ -453,7 +457,7 @@ public class SingleGroupDefinitionView extends EnhancedVLayout
implements Bookma
"resource.type.plugin = JBossAS", //
"resource.type.name = JBossAS Server"));
items.put(TEMPLATE_PLATFORMS, //
- buildTemplate("resource.type.category = PLATFORM", //
+ buildTemplate("resource.type.category = PLATFORM", //
"groupby resource.name"));
items.put(TEMPLATE_UNIQUE_RESOURCE_TYPES, //
buildTemplate("groupby resource.type.plugin", //
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 dae0261..b6ed982 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
@@ -862,7 +862,7 @@ view_admin_systemSettings_LDAPGroupFilter_desc = LDAP search filter
that must re
view_admin_systemSettings_LDAPGroupFilter_name = Group Search Filter
view_admin_systemSettings_LDAPGroupMember_desc = LDAP search filter that is used in
conjunction with the group search filter to determine user authorization. This is used for
LDAP group authorization.
view_admin_systemSettings_LDAPGroupMember_name = Group Member Filter
-view_admin_systemSettings_LDAPGroupPageSize_desc = To support RFC 2696, this LDAP Group
Page Size search parameter is used in conjunction with other group search parameters to
limit the number of group members returned with each query result. This value should be
set as high as possible and to the server side max page size value for best results.
Values > (server max page size) will have no effect. Lower this value when LDAP group
queries are taking too long to return. Default is 1000 results.
+view_admin_systemSettings_LDAPGroupPageSize_desc = To support RFC 2696, this LDAP Group
Page Size search parameter is used in conjunction with other group search parameters to
limit the number of group members returned with each query result. This value should be
set as high as possible and to the server side max page size value for best results.
Values > (server max page size) will have no effect. Lower this value when LDAP group
queries are taking too long to return. Default is 1000 results.
view_admin_systemSettings_LDAPGroupPageSize_name = Group Search Page Size
view_admin_systemSettings_LDAPGroupUsePaging_desc = Defines whether LDAP Group queries
should use Simple Paged Results functionality as defined by RFC 2696. Specifically for
LDAP servers that limit query results, the client will continually page through all the
results in Group Page Size chunks until done. Defaults to false.
view_admin_systemSettings_LDAPGroupUsePaging_name = Use Group Query Paging
@@ -978,7 +978,7 @@ view_alert_definition_condition_editor_availability_tooltip = Specify
the availa
view_alert_definition_condition_editor_availability_value = Availability
view_alert_definition_condition_editor_common_avg = Average
view_alert_definition_condition_editor_common_baseUnits = Base Units
-view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available units:
+view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available
units:
view_alert_definition_condition_editor_common_baseUnits_none = None
view_alert_definition_condition_editor_common_max = Maximum
view_alert_definition_condition_editor_common_min = Minimum
@@ -1637,6 +1637,7 @@ view_dynagroup_recalcSuccessful = You have successfully recalculated
this group
view_dynagroup_recalcSuccessfulSelection = You have successfully recalculated [{0}] group
definitions
view_dynagroup_recalculate = Recalculate
view_dynagroup_recalculationInterval = Recalculation Interval (min)
+view_dynagroup_recalculationInterval_error = Value must be an integer
view_dynagroup_recursive = Recursive
view_dynagroup_saveAndRecalculate = Save & Recalculate
view_dynagroup_saveFailure = Failed to save the group definition named [{0}]
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 08b1d22..543b45c 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
@@ -912,7 +912,7 @@ view_alert_definition_condition_editor_avilability_tooltip = Geben Sie
die Ände
view_alert_definition_condition_editor_avilability_value = Verfügbarkeit
view_alert_definition_condition_editor_common_avg = Durchschnitt
##view_alert_definition_condition_editor_common_baseUnits = Base Units
-##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available
units:
+##view_alert_definition_condition_editor_common_baseUnits_availableUnits = Available
units:
##view_alert_definition_condition_editor_common_baseUnits_none = None
view_alert_definition_condition_editor_common_max = Maximum
view_alert_definition_condition_editor_common_min = Minimum
@@ -1503,7 +1503,8 @@ view_dynagroup_recalcFailureSelection = Fehler beim Neuberechnen der
ausgewählt
view_dynagroup_recalcSuccessful = Neuberechnung der Gruppendefinitionen war erfolgreich
view_dynagroup_recalcSuccessfulSelection = Sie haben erfolgreich [{0}]
Gruppendefinitionen neu berechnet
view_dynagroup_recalculate = Neu berechnen
-view_dynagroup_recalculationInterval = Intervall für die Neuberechnung
+view_dynagroup_recalculationInterval = Intervall für die Neuberechnung (in Minuten)
+view_dynagroup_recalculationInterval_error = Wert muss ganzzahlig sein
view_dynagroup_recursive = Rekursiv
view_dynagroup_saveAndRecalculate = Speichern & neu berechnen
view_dynagroup_saveFailure = Speichern der Gruppendefiniton mit Namen [{0}] ist
fehlgeschlagen
Show replies by date