myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r641582 - /myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
Date Wed, 26 Mar 2008 21:29:13 GMT
Author: lu4242
Date: Wed Mar 26 14:29:12 2008
New Revision: 641582

URL: http://svn.apache.org/viewvc?rev=641582&view=rev
Log:
fix MYFACES-1836 f:convertDateTime type=date is ignored

Modified:
    myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java

Modified: myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java?rev=641582&r1=641581&r2=641582&view=diff
==============================================================================
--- myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
(original)
+++ myfaces/core/trunk_1.2.x/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
Wed Mar 26 14:29:12 2008
@@ -235,14 +235,12 @@
             {
                 type = DEFAULT_TYPE;
             }
-            else
+            if (!TYPE_DATE.equals(type) && 
+                    !TYPE_TIME.equals(type) &&
+                    !TYPE_BOTH.equals(type))
             {
-                if (_dateStyle != null) {
-                    type = TYPE_BOTH;
-                } else {
-                    type = TYPE_TIME;
-                }
-           }
+                type = DEFAULT_TYPE;
+            }
 
             converter.setType(type);
         }



Mime
View raw message