Change locking semantics -- now everything in the last round can be edited, and nothi...

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index fa95fb4d67a86d8443602c9e432c2d462ec93199..7d0d608ad9ccc1fa949bf75c212c8ed6031543fb 100755 (executable)
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -50,21 +50,25 @@ for my $score (@$scores) {
        my $pl = $p->[$#$p]->{'players'};
        if ($score->{'nick'} ne $player) {
                $player = $score->{'nick'};
        my $pl = $p->[$#$p]->{'players'};
        if ($score->{'nick'} ne $player) {
                $player = $score->{'nick'};

-               push @$pl, { player => $score->{'player'}, nick => $player, songs => [], total => 0, locked => 1 };
+               push @$pl, { player => $score->{'player'}, nick => $player, songs => [], total => 0 };

        }
        
        push @{$pl->[$#$pl]->{'songs'}}, $score;
 
        if (defined($score->{'score'})) {
                $pl->[$#$pl]->{'total'} += $score->{'score'};
        }
        
        push @{$pl->[$#$pl]->{'songs'}}, $score;
 
        if (defined($score->{'score'})) {
                $pl->[$#$pl]->{'total'} += $score->{'score'};

-       } else {
-               $pl->[$#$pl]->{'locked'} = 0;

        }
 }
 
 my $num_rounds = scalar @rounds;
 my $num_rankings = scalar @$rankings;
 
        }
 }
 
 my $num_rounds = scalar @rounds;
 my $num_rankings = scalar @$rankings;
 

+# Lock all rounds but the last (active?) one
+for my $r (0..$#rounds-1) {
+       $rounds[$r]->{'locked'} = 1;
+}
+$rounds[$#rounds]->{'locked'} = 0;
+

 # If there have been no rounds, check out the number of participants; if not, check the
 # number of qualified from the last round
 my $num_qualified;
 # If there have been no rounds, check out the number of participants; if not, check the
 # number of qualified from the last round
 my $num_qualified;

diff --git a/html/templates/show-tournament.tmpl b/html/templates/show-tournament.tmpl
index c2cbfa0efdebc7e61280d4d4c6af86825a3914c4..9ec5dec8614b5b7bfb13d1bb0325e6f38353ea2b 100644 (file)
--- a/html/templates/show-tournament.tmpl
+++ b/html/templates/show-tournament.tmpl
@@ -105,7 +105,7 @@
     </tr>
     
     [% FOR pl = p.players %]
     </tr>
     
     [% FOR pl = p.players %]

-      [% IF pl.locked %]
+      [% IF r.locked %]

     <tr>
       <th>
         [% pl.nick %]
     <tr>
       <th>
         [% pl.nick %]