Always used the "paged" template for multiple photo display. Fixes #19.

[memories.git] / Memories / Photo.pm

diff --git a/Memories/Photo.pm b/Memories/Photo.pm
index a92280782c721af1d6e04987d5861d9981d9d7dd..5ce8d956145728a8906e6f6418b78aba0893cd95 100644 (file)
--- a/Memories/Photo.pm
+++ b/Memories/Photo.pm
@@ -1,5 +1,5 @@
 package Memories::Photo;
-use Apache2::Upload;
+#use Apache2::Upload;
 use File::Basename;
 use File::Copy;
 use Archive::Any;
@@ -65,7 +65,7 @@ sub do_upload :Exported {
     }
     $r->objects(\@photos);
     if (@photos == 0) { $r->template("upload"); return  }
-    if (@photos > 1) { $r->template("list") } 
+    if (@photos > 1) { $r->template_args->{title} = "This upload"; $r->template("paged") } 
     else { $r->template("view"); }
     $r->message("Thanks for the upload!"); 
 }
@@ -84,7 +84,7 @@ sub quarantine :Exported {
     }
     $r->{session}{quarantined} = join ",", sort keys %q;
     if (!$r->{session}{quarantined}) {
-        $r->template("list");
+        $r->template_args->{title} = "This upload"; $r->template("paged");
         $r->objects([ map { $self->retrieve($_) } @quarantined ]);
     } else {
         $r->objects([ map { $self->retrieve($_) } sort keys %q ]);
@@ -128,10 +128,10 @@ sub upload_raw {
     $filename =~ /\.(.*)$/;
     my $format = $1;
     # Put the file in place
+    my $photo = $self->upload_jpeg($r, $jpg, $offered_name);
     $photo->format($format);
     copy($filename, 
          Memories->config->{data_store}."/".$photo->id.".".$format);
-    my $photo = $self->upload_jpeg($r, $jpg, $offered_name);
     return $photo;
 }