modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
| 10 ++++++++--
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java
| 9 +++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
New commits:
commit 08f7934eecde748578f075d26018fcc348693fae
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Wed Jul 10 16:44:00 2013 +0200
[BZ 977782] - Incorrect error message is shown when creating a new dynaGroup
definition with incorrect name - added regexp validator to the coregui.
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 99e0192..1afa30d 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,8 @@ 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.RegExpValidator;
+import com.smartgwt.client.widgets.form.validator.Validator;
import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.HoverCustomizer;
import com.smartgwt.client.widgets.grid.ListGrid;
@@ -82,10 +84,10 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupsDataSource;
import
org.rhq.enterprise.gui.coregui.client.inventory.groups.definitions.GroupDefinitionExpressionBuilder.AddExpressionHandler;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
-import org.rhq.enterprise.gui.coregui.client.util.message.Message;
-import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedIButton;
import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
+import org.rhq.enterprise.gui.coregui.client.util.message.Message;
+import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
/**
* @author Joseph Marques
@@ -136,6 +138,10 @@ public class SingleGroupDefinitionView extends EnhancedVLayout
implements Bookma
description.setValue(groupDefinition.getDescription());
recalculationInterval.setValue(groupDefinition.getRecalculationInterval() / (60 *
1000));
expression.setValue(groupDefinition.getExpression());
+
+ Validator nameValidator = new
RegExpValidator("^[^\\<\\$\\'\\{\\[]{1,100}$");
+ nameValidator.setErrorMessage("Name must not contain following characters:
< $ ' [ {");
+ name.setValidators(nameValidator);
final DynamicForm form = new DynamicForm();
form.setFields(id, name, description, templateSelectorTitleSpacer,
templateSelector, expression, recursive,
commit fa8e8225c6777c5d7e57c25aae3b80a180cbc58b
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Wed Jul 10 14:54:21 2013 +0200
[BZ 975502] - Its possible to create a dynaGroup definition with recalculation
Interval < 1 minute via CLI - added simple checks to the GroupDefinitionManagerBean.
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java
index 8713928..bb2587f 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java
@@ -242,6 +242,15 @@ public class GroupDefinitionManagerBean implements
GroupDefinitionManagerLocal,
if (name.contains("<") || name.contains("$") ||
name.contains("'") || name.contains("{") ||
name.contains("[")) {
throw new GroupDefinitionException("Name must not contain
<,$,',[,{ characters");
}
+
+ if (definition.getRecalculationInterval() < 0) {
+ throw new GroupDefinitionException("Recalculation interval cannot be
negative");
+ }
+
+ if (definition.getRecalculationInterval() > 0 &&
definition.getRecalculationInterval() < 60 * 1000) {
+ throw new GroupDefinitionException(
+ "Recalculation interval cannot be a positive number lower than 1
minute (60000ms)");
+ }
Query query =
entityManager.createNamedQuery(GroupDefinition.QUERY_FIND_BY_NAME);
query.setParameter("name", name);
Show replies by date