General restructuring, and a delete method which doesn't quite work yet.

[maypole.git] / lib / Apache / MVC / Model / Base.pm

diff --git a/lib/Apache/MVC/Model/Base.pm b/lib/Apache/MVC/Model/Base.pm
index 89feb7c07278538e5ead90319fcbc3695e355dc6..afbc60df7eebd1e24127e7badb7d680cff14ad6c 100644 (file)
--- a/lib/Apache/MVC/Model/Base.pm
+++ b/lib/Apache/MVC/Model/Base.pm
@@ -7,25 +7,20 @@ sub MODIFY_CODE_ATTRIBUTES {
 sub FETCH_CODE_ATTRIBUTES { $remember{$_[1]} 
 } 
 
-sub view :Exported {
-    my ($self, $r) = @_;
-    return $self->retrieve(shift @{$r->{args}});
-}
-
-sub edit :Exported {
-    my ($self, $r) = @_;
-    return $self->retrieve(shift @{$r->{args}});
-}
+sub view :Exported { }
+sub edit :Exported { }
 
 sub do_edit { die "This is an abstract method" }
+sub get_objects { die "This is an abstract method" }
 
 sub list :Exported {
     my ($self, $r) = @_;
-    return $self->retrieve_all;
+    $r->objects([ $self->retrieve_all ]);
 }
 
 sub process {
     my ($class, $r) = @_;
     $r->template( my $method = $r->action );
-    $r->objects([ $class->$method($r) ]);
+    $r->objects([ $class->get_objects($r) ]);
+    $class->$method($r) 
 }