[Jifty-commit] r1086 - in jifty/branches/jifty-jsan: . lib/Jifty/Web
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Mon May 22 16:43:59 EDT 2006
Author: alexmv
Date: Mon May 22 16:43:57 2006
New Revision: 1086
Modified:
jifty/branches/jifty-jsan/ (props changed)
jifty/branches/jifty-jsan/lib/Jifty/Action.pm
jifty/branches/jifty-jsan/lib/Jifty/Web/Form.pm
Log:
r13204 at zoq-fot-pik: chmrr | 2006-05-22 16:43:48 -0400
* Register actions of buttons in the buttons, not in the form
Modified: jifty/branches/jifty-jsan/lib/Jifty/Action.pm
==============================================================================
--- jifty/branches/jifty-jsan/lib/Jifty/Action.pm (original)
+++ jifty/branches/jifty-jsan/lib/Jifty/Action.pm Mon May 22 16:43:57 2006
@@ -423,8 +423,14 @@
submit => $self,
@_);
- Jifty->web->form->register_action( $self );
- Jifty->web->form->print_action_registration($self->moniker);
+ # Unless we've printed a moniker for the action, we embed the
+ # action registration into the button
+ unless ( Jifty->web->form->printed_actions->{ $self->moniker } ) {
+ $args{parameters}{ $self->register_name } = ref $self;
+ $args{parameters}{ $self->double_fallback_form_field_name($_) }
+ = $self->argument_value($_) || $self->arguments->{$_}->{'default_value'}
+ for grep { $self->arguments->{$_}{constructor} } keys %{ $self->arguments };
+ }
$args{parameters}{$self->form_field_name($_)} = $args{arguments}{$_}
for keys %{$args{arguments}};
Modified: jifty/branches/jifty-jsan/lib/Jifty/Web/Form.pm
==============================================================================
--- jifty/branches/jifty-jsan/lib/Jifty/Web/Form.pm (original)
+++ jifty/branches/jifty-jsan/lib/Jifty/Web/Form.pm Mon May 22 16:43:57 2006
@@ -230,7 +230,7 @@
my $action = $self->has_action($moniker);
return unless ($action);
return if exists $self->printed_actions->{$moniker};
- $self->printed_actions->{$moniker} = 1;
+ $self->printed_actions->{$moniker} = 1;
$action->register();
More information about the Jifty-commit
mailing list