}
-sub do_edit : Exported {
- my ( $self, $r ) = @_;
- my $h = CGI::Untaint->new( %{ $r->{params} } );
- my $creating = 0;
- my ($obj) = @{ $r->objects || [] };
+sub do_edit : Exported
+{
+ my ($self, $r, $obj) = @_;
+
+ my $config = $r->config;
+ my $table = $r->table;
+
+ my $required_cols = $config->{$table}->{required_cols} || [];
+
+ ($obj, my $fatal, my $creating) = $self->_do_update_or_create($r, $obj, $required_cols);
+
+ # handle errors, if none, proceed to view the newly created/updated object
+ my %errors = $fatal ? (FATAL => $fatal) : $obj->cgi_update_errors;
+
+ if (%errors)
+ {
+ # Set it up as it was:
+ $r->template_args->{cgi_params} = $r->params;
+ $r->template_args->{errors} = \%errors;
+
+ undef $obj if $creating;
+ $r->template("edit");
+ }
+ else
+ {
+ $r->template("view");
+ }
+
+ $r->objects( $obj ? [$obj] : []);
+}
+
+# drb - I've (probably temporarily) split this out from do_edit, so it's
+# reported by Mp::P::Trace
+sub _do_update_or_create
+{
+ my ($self, $r, $obj, $required_cols) = @_;
+
my $fatal;
- if ($obj) {
+ my $creating = 0;
+ my $h = CGI::Untaint->new( %{$r->params} );
+
+ # update or create
+ if ($obj)
+ {
# We have something to edit
- eval {
- $obj->update_from_cgi( $h =>
- { required => $r->{config}{ $r->{table} }{required_cols} || [], }
- );
- };
+ eval { $obj->update_from_cgi( $h => {required => $required_cols} ) };
$fatal = $@;
}
- else {
- eval {
- $obj =
- $self->create_from_cgi( $h =>
- { required => $r->{config}{ $r->{table} }{required_cols} || [], }
- );
+ else
+ {
+ eval {
+ $obj = $self->create_from_cgi( $h => {required => $required_cols} )
};
- if ($fatal = $@) {
+
+ if ($fatal = $@)
+ {
warn "$fatal" if $r->debug;
}
$creating++;
}
- if ( my %errors = $fatal ? (FATAL => $fatal) : $obj->cgi_update_errors ) {
-
- # Set it up as it was:
- $r->{template_args}{cgi_params} = $r->{params};
- $r->{template_args}{errors} = \%errors;
-
- undef $obj if $creating;
- $r->template("edit");
- }
- else {
- $r->{template} = "view";
- }
- $r->objects( $obj ? [$obj] : []);
+
+ return $obj, $fatal, $creating;
}
-
+
sub delete : Exported {
return shift->SUPER::delete(@_) if caller ne "Maypole::Model::Base";
my ( $self, $r ) = @_;