[Jifty-commit] r2536 - in jifty/branches/template-declare: . lib/Jifty share/web/static/js

[jifty-commit at lists.jifty.org]

Author: trs
Date: Sat Jan 20 01:35:16 2007
New Revision: 2536

Modified:
   jifty/branches/template-declare/   (props changed)
   jifty/branches/template-declare/lib/Jifty/Action.pm
   jifty/branches/template-declare/share/web/static/js/bps_util.js
   jifty/branches/template-declare/share/web/static/js/jifty.js
   jifty/branches/template-declare/share/web/templates/__jifty/validator.xml

Log:
Mergedown from trunk.

 r18994 at zot (orig r2534):  trs | 2007-01-20 00:50:05 -0500
  r18993 at zot:  tom | 2007-01-20 00:49:56 -0500
  Fix how fake buttons submit forms
 
 r18996 at zot (orig r2535):  trs | 2007-01-20 01:31:42 -0500
  r18995 at zot:  tom | 2007-01-20 01:30:41 -0500
  Reverting r2043 because validating empty fields is wrong.  Also reverting r2461 because it serves no use with r2043 reverted.
 


Modified: jifty/branches/template-declare/lib/Jifty/Action.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Action.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/Action.pm	Sat Jan 20 01:35:16 2007
@@ -857,11 +857,11 @@
     return unless $field_info;
 
     my $value = $self->argument_value($field);
-
-    if (    $field_info->{mandatory}
-        and $self->_is_argument_value_deleted($field) )
-    {
-        return $self->validation_error( $field => _("You need to fill in this field") );
+    
+    if ( !defined $value || !length $value ) {
+        if ( $field_info->{mandatory} ) {
+            return $self->validation_error( $field => _("You need to fill in this field") );
+        }
     }
 
     # If we have a set of allowed values, let's check that out.
@@ -898,31 +898,6 @@
     }
 }
 
-sub _is_argument_value_deleted {
-    my $self  = shift;
-    my $field = shift;
-
-    my $value = $self->argument_value($field);
-
-    my $field_info = $self->arguments->{$field};
-    return unless $field_info;
-
-    my $default_value;
-    $default_value = $field_info->{'default_value'}
-      if exists $field_info->{'default_value'};
-    $default_value = $value
-      if $self->has_argument($field) && $value && !$self->values_from_request->{$field};
-
-    if ( not defined $value or not length $value ) {
-        if (   ( defined $default_value && $value ne $default_value )
-            || ( Jifty->web->request->path !~ m{^/__jifty/validator\.xml} ) )
-        {
-            return 1;
-        }
-    }
-    return 0;
-}
-
 =head2 _autocomplete_argument ARGUMENT
 
 Get back a list of possible completions for C<ARGUMENT>.  The list

Modified: jifty/branches/template-declare/share/web/static/js/bps_util.js
==============================================================================
--- jifty/branches/template-declare/share/web/static/js/bps_util.js	(original)
+++ jifty/branches/template-declare/share/web/static/js/bps_util.js	Sat Jan 20 01:35:16 2007
@@ -37,6 +37,7 @@
             hidden.setAttribute("type", "hidden");
             hidden.setAttribute("name", a.getAttribute("name"));
             a["virtualform"].appendChild( hidden );
+            a["virtualform"].onsubmit();
             a["virtualform"].submit();
         });
     }

Modified: jifty/branches/template-declare/share/web/static/js/jifty.js
==============================================================================
--- jifty/branches/template-declare/share/web/static/js/jifty.js	(original)
+++ jifty/branches/template-declare/share/web/static/js/jifty.js	Sat Jan 20 01:35:16 2007
@@ -1043,8 +1043,10 @@
      
      if(form && !form.hasPlaceholders) {
          form.hasPlaceholders = true;
-         Event.observe(form, 'submit',
-                       function () { Form.clearPlaceholders(form); } );
+         // We can't attach this event via DOM event methods because 
+         // we need to call form.submit() sometimes and still have a good
+         // way to call this event handler
+         form.onsubmit = function () { Form.clearPlaceholders(form); };
      }
   },
 

Modified: jifty/branches/template-declare/share/web/templates/__jifty/validator.xml
==============================================================================
--- jifty/branches/template-declare/share/web/templates/__jifty/validator.xml	(original)
+++ jifty/branches/template-declare/share/web/templates/__jifty/validator.xml	Sat Jan 20 01:35:16 2007
@@ -13,9 +13,8 @@
         if ( not $action->arguments->{$arg}->{ajax_validates} ) {
             $writer->emptyTag( "ignored", id => $action->error_div_id($arg) );
             $writer->emptyTag( "ignored", id => $action->warning_div_id($arg) );
-        } elsif ( not $action->arguments->{$arg}->{mandatory}
-		  and (not defined $action->argument_value($arg)
-                       or length $action->argument_value($arg) == 0 ) ) {
+        } elsif ( not defined $action->argument_value($arg)
+                  or length $action->argument_value($arg) == 0 ) {
             $writer->emptyTag( "blank", id => $action->error_div_id($arg) );
             $writer->emptyTag( "blank", id => $action->warning_div_id($arg) );
         } elsif ( $action->result->field_error($arg) ) {