Changeset 68 for trunk

Show
Ignore:
Timestamp:
08/08/07 04:39:03 (1 year ago)
Author:
simon
Message:

At least one of these changes is showstopper!

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Memories/Photo.pm

    r59 r68  
    166166    # Add system tags here 
    167167    my $tag = "date:".$photo->shot->ymd; 
    168     $photo->add_to_system_tags({tag => Memories::SystemTag->find_or_create({name =>$tag}) }); 
     168    $photo->add_to_system_tags({system_tag => Memories::SystemTag->find_or_create({name =>$tag}) }); 
    169169    return $photo; 
    170170} 
    …… 
    180180    my $photo = $r->{objects}[0]; 
    181181    my $delta = $r->{params}{rating}; 
    182     if ($delta < 0 or $delta > 5) { return; } # Scammer 
     182    if ($delta <= 0 or $delta > 5) { return; } # Scammer 
    183183    # XXX Race 
    184184    $photo->rating($photo->rating() + $delta); 
    …… 
    214214sub delete :Exported { 
    215215    my ($self, $r, $photo) = @_; 
     216    if ($r) {  
    216217    if ($photo and $photo->uploader == $r->user) { 
    217218        $photo->delete; 
    …… 
    219220    } 
    220221    $r->template("frontpage"); 
     222    } else { $self->SUPER::delete() }  
    221223} 
    222224 
    …… 
    242244    my ($self, $r, $photo) = @_; 
    243245    $r->template("view"); 
     246    if ($r->params->{content} =~ /\S/) { 
    244247    $r->objects->[0]->add_to_comments({ 
    245248        name => $r->params->{name}, 
    246249        content => $r->params->{content} 
    247250    }); 
     251    } 
    248252} 
    249253