Changeset 36

Timestamp:

02/17/07 19:28:57 (2 years ago)

Author:

simon

Message:

Quarantine non-tagged photos. Closes #14.

Files:

• trunk/Memories.pm (modified) (2 diffs)
• trunk/Memories/Photo.pm (modified) (1 diff)
• trunk/templates/photo/quarantine (added)

trunk/Memories.pm

@@ -2 +2 @@
-use strict;
-our $VERSION = "1.2";
- -Debug
+
-use HTML::TagCloud;
-use URI;
@@ -93 +93 @@
-   $r->get_user;
-   if (!$r->user and $self->path =~ /upload/) { $r->template("login"); }
+   # Don't let 'em go until they've fixed it
+   warn "Quarantine is : ".$r->session->{quarantined};
+   if ($r->session->{quarantined} and $self->path !~ /js$/) { 
+       $r->table("photo"); $r->action("quarantine");
+       $r->model_class("Memories::Photo");
+   }
-   return OK; 
-}

trunk/Memories/Photo.pm

@@ -49 +49 @@
-    my $upload = $r->{ar}->upload("photo");
-    # Check $self->type
-$self->upload_jpeg($upload->tempname, ($r->params->{title}||basename($upload->filename)), $r->params->{tags}, $r
+($self->upload_jpeg($upload->tempname, ($r->params->{title}||basename($upload->filename)), $r->params->{tags}, $r)
-    my @quarantined = grep { !$_->tags } @photos;
+    warn "Quarantined these photos: ".join(",", map {$_->id} @quarantined);
-    # Set it up to go again
+    if (@quarantined) { 
+        $r->{session}{quarantined} = join ",", sort map { $_->id} @quarantined;
+        warn "Setting quarantineined to: ".( join ",", sort map { $_->id} @quarantined);
+        $r->objects(\@quarantined);
+        $r->template("quarantine");
+        return;
+    }
-    $r->objects(\@photos);
-
+
+
-    $r->message("Thanks for the upload!"); 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-sub upload_jpeg {
-    my ($self, $filename, $title, $tags, $r) = @_;
-    my $quarantine;
-    my $photo = $self->create({
-        uploader => $r->user,