[jboss-svn-commits] JBL Code SVN: r34654 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client: messages and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: tsurdilovic
Date: 2010-08-11 20:30:45 -0400 (Wed, 11 Aug 2010)
New Revision: 34654

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDTColumnConfig.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
Log:
GUVNOR-592

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDTColumnConfig.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDTColumnConfig.java	2010-08-11 23:09:39 UTC (rev 34653)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/decisiontable/GuidedDTColumnConfig.java	2010-08-12 00:30:45 UTC (rev 34654)
@@ -218,12 +218,12 @@
                 }
                 if ( editingCol.constraintValueType != BaseSingleFieldConstraint.TYPE_PREDICATE ) {
                     if ( null == editingCol.factField || "".equals( editingCol.factField ) ) {
-                        Window.alert( constants.PleaseSelectOrEnterField() );
-                        return;
+                        Window.alert(constants.PleaseSelectOrEnterField());
+                    	return;
                     }
                     if ( null == editingCol.operator || "".equals( editingCol.operator ) ) {
-                        Window.alert( constants.PleaseSelectAnOperator() );
-                        return;
+                    	// Operator field optional
+                        Window.alert( constants.NotifyNoSelectedOperator() );
                     }
 
                 }

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java	2010-08-11 23:09:39 UTC (rev 34653)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java	2010-08-12 00:30:45 UTC (rev 34654)
@@ -1749,8 +1749,12 @@
     String HideThisColumn();
 
     String PleaseSelectOrEnterField();
+    
+    String NotifyNoSelectedOrEnteredField();
 
     String PleaseSelectAnOperator();
+    
+    String NotifyNoSelectedOperator();
 
     String January();
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties	2010-08-11 23:09:39 UTC (rev 34653)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties	2010-08-12 00:30:45 UTC (rev 34654)
@@ -861,7 +861,9 @@
 DefaultValue=Default value:
 HideThisColumn=Hide this column
 PleaseSelectOrEnterField=Please select or enter field
+NotifyNoSelectedOrEnteredField=Field has not been selected or entered
 PleaseSelectAnOperator=Please select an operator
+NotifyNoSelectedOperator=Operator has not been selected
 January=January
 February=February
 March=March