svn commit: r592718 - in /ofbiz/trunk/framework/widget: config/conditional.properties config/conditional_it.properties dtd/widget-form.xsd src/org/ofbiz/widget/html/HtmlFormRenderer.java

[jacopoc]

Author: jacopoc
Date: Wed Nov  7 03:37:51 2007
New Revision: 592718

URL: http://svn.apache.org/viewvc?rev=592718&view=rev
Log:
Added support to text-find fields for != operation.

Modified:
    ofbiz/trunk/framework/widget/config/conditional.properties
    ofbiz/trunk/framework/widget/config/conditional_it.properties
    ofbiz/trunk/framework/widget/dtd/widget-form.xsd
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java

Modified: ofbiz/trunk/framework/widget/config/conditional.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/config/conditional.properties?rev=592718&r1=592717&r2=592718&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/config/conditional.properties (original)
+++ ofbiz/trunk/framework/widget/config/conditional.properties Wed Nov  7 03:37:51 2007
@@ -20,6 +20,7 @@
 begins_with=Begins With
 contains=Contains
 is_empty=Is Empty
+not_equal=Not Equal
 greater_than=Greater Than
 greater_than_equals=Greater Than Equals
 less_than_equals=Less Than Equals

Modified: ofbiz/trunk/framework/widget/config/conditional_it.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/config/conditional_it.properties?rev=592718&r1=592717&r2=592718&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/config/conditional_it.properties (original)
+++ ofbiz/trunk/framework/widget/config/conditional_it.properties Wed Nov  7 03:37:51 2007
@@ -21,6 +21,7 @@
 begins_with=Inizia Con
 contains=Contiene
 is_empty=E' Vuoto
+not_equal=Diverso Da
 greater_than=Maggiore Di
 greater_than_equals=Maggiore Uguale
 less_than_equals=Minore Uguale

Modified: ofbiz/trunk/framework/widget/dtd/widget-form.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/dtd/widget-form.xsd?rev=592718&r1=592717&r2=592718&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/dtd/widget-form.xsd (original)
+++ ofbiz/trunk/framework/widget/dtd/widget-form.xsd Wed Nov  7 03:37:51 2007
@@ -830,6 +830,7 @@
                     <xs:enumeration value="like"/>
                     <xs:enumeration value="contains"/>
                     <xs:enumeration value="empty"/>
+                    <xs:enumeration value="notEqual"/>
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java?rev=592718&r1=592717&r2=592718&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java Wed Nov  7 03:37:51 2007
@@ -1490,6 +1490,7 @@
         String opContains = UtilProperties.getMessage("conditional", "contains", locale);
         String opIsEmpty = UtilProperties.getMessage("conditional", "is_empty", locale);
         String ignoreCase = UtilProperties.getMessage("conditional", "ignore_case", locale);
+        String opNotEqual = UtilProperties.getMessage("conditional", "not_equal", locale);
 
         String defaultOption = textFindField.getDefaultOption();
         boolean ignCase = textFindField.getIgnoreCase();
@@ -1501,6 +1502,7 @@
         buffer.append("<option value=\"like\"" + ("like".equals(defaultOption)? " selected": "") + ">" + opBeginsWith + "</option>");
         buffer.append("<option value=\"contains\"" + ("contains".equals(defaultOption)? " selected": "") + ">" + opContains + "</option>");
         buffer.append("<option value=\"empty\"" + ("empty".equals(defaultOption)? " selected": "") + ">" + opIsEmpty + "</option>");
+        buffer.append("<option value=\"notEqual\"" + ("notEqual".equals(defaultOption)? " selected": "") + ">" + opNotEqual + "</option>");
         buffer.append("</select>");
         
         buffer.append("<input type=\"text\"");