Fix bugs in user_list and set_passphrase

diff --git a/lib/Gruntmaster/Data.pm b/lib/Gruntmaster/Data.pm
index 1e268aff8308473da98619446f4c130e2490eaae..5754491737e846ac5d5f4177bea0b9bca9947edd 100644 (file)
--- a/lib/Gruntmaster/Data.pm
+++ b/lib/Gruntmaster/Data.pm
@@ -103,9 +103,9 @@ sub job_list {
        my ($self, %args) = @_;
        $args{page} //= 1;
        my $rs = $self->jobs->search(undef, {order_by => {-desc => 'me.id'}, prefetch => ['problem', 'owner'], rows => JOBS_PER_PAGE, offset => ($args{page} - 1) * JOBS_PER_PAGE});
-       $rs = $rs->search({owner   => $args{owner}})   if $args{owner};
-       $rs = $rs->search({contest => $args{contest}}) if $args{contest};
-       $rs = $rs->search({problem => $args{problem}}) if $args{problem};
+       $rs = $rs->search({'me.owner' => $args{owner}})   if $args{owner};
+       $rs = $rs->search({contest    => $args{contest}}) if $args{contest};
+       $rs = $rs->search({problem    => $args{problem}}) if $args{problem};
        [map {
                my %params = $_->get_columns;
                $params{owner_name}   = $_->owner->name;

diff --git a/lib/Gruntmaster/Data/Result/User.pm b/lib/Gruntmaster/Data/Result/User.pm
index 4385b76554c55b5971a0891b40df28a5112f1264..54e6b52c2527653ddaca9496655f4d8d01533547 100644 (file)
--- a/lib/Gruntmaster/Data/Result/User.pm
+++ b/lib/Gruntmaster/Data/Result/User.pm
@@ -191,7 +191,7 @@ sub set_passphrase {
                cost => 10,
                passphrase => $pw,
                salt_random => 1,
-       )})->as_rfc2307;
+       )->as_rfc2307});
 }
 
 1;