[mb-commits] r10090 - in mb_server/branches/TemplateToolkit: . lib/MusicBrainz/Server/Controller lib/MusicBrainz/Server/Form/User

[root at musicbrainz.org]

Author: acid2
Date: 2008-07-11 01:34:31 +0000 (Fri, 11 Jul 2008)
New Revision: 10090

Modified:
   mb_server/branches/TemplateToolkit/Makefile.PL
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Root.pm
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/User/ChangePassword.pm
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/User/Register.pm
Log:
Better handling of the homepage if the server does not have XML::RSS (we don't require it)
Moved forms cross validation to the cross_validate method which I had no idea existed, whoops!


Modified: mb_server/branches/TemplateToolkit/Makefile.PL
===================================================================
--- mb_server/branches/TemplateToolkit/Makefile.PL	2008-07-11 01:14:38 UTC (rev 10089)
+++ mb_server/branches/TemplateToolkit/Makefile.PL	2008-07-11 01:34:31 UTC (rev 10090)
@@ -34,6 +34,7 @@
 requires 'String::Similarity';
 requires 'Text::Unaccent';
 requires 'Text::WikiFormat';
+requires 'XML::RSS';
 requires 'YAML';
 
 catalyst;

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Root.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Root.pm	2008-07-11 01:14:38 UTC (rev 10089)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Root.pm	2008-07-11 01:34:31 UTC (rev 10090)
@@ -74,21 +74,22 @@
         update_interval => 5 * 60,
         max_items => 3);
     
-    $feed->Load() if defined $feed;
+    if (defined $feed)
+    {
+        $feed->Load();
 
-    # Process the items to a template friendly data structure
-    #
-    my $item = undef;    
-    $c->stash->{blog} = [];
+        # Process the items to a template friendly data structure
+        $c->stash->{blog} = [];
 
-    foreach $item ($feed->GetItems())
-    {
-        push @{ $c->stash->{blog} }, {
-            title => $item->GetTitle,
-            description => $item->GetDescription,
-            date_time => $item->GetDateTimeString,
-            link => $item->GetLink,
-        };
+        foreach my $item ($feed->GetItems())
+        {
+            push @{ $c->stash->{blog} }, {
+                title => $item->GetTitle,
+                description => $item->GetDescription,
+                date_time => $item->GetDateTimeString,
+                link => $item->GetLink,
+            };
+        }
     }
 
     $c->stash->{template} = 'main/index.tt';

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/User/ChangePassword.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/User/ChangePassword.pm	2008-07-11 01:14:38 UTC (rev 10089)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/User/ChangePassword.pm	2008-07-11 01:34:31 UTC (rev 10090)
@@ -17,11 +17,14 @@
     };
 }
 
-sub validate_confirm_new_password {
-    my ($self, $field) = @_;
+sub cross_validate {
+    my ($self) = @_;
 
-    $field->add_error("The new password fields must match")
-        if $field->value ne $self->value('new_password');
+    my ($new, $confirm) = ( $self->field('new_password'),
+                            $self->field('confirm_new_password') );
+
+    $confirm->add_error("The new password fields must match")
+        if $confirm->value ne $new->value;
 }
 
 1;

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/User/Register.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/User/Register.pm	2008-07-11 01:14:38 UTC (rev 10089)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/User/Register.pm	2008-07-11 01:34:31 UTC (rev 10090)
@@ -26,11 +26,14 @@
     };
 }
 
-sub validate_confirm_password {
-    my ($self, $field) = @_;
+sub cross_validate {
+    my $self = shift;
 
-    $field->add_error("Both provided passwords must be equal")
-        if $field->value ne $self->value('password');
+    my ($pass, $confirm) = ( $self->field('password'),
+                             $self->field('confirm_password') );
+
+    $confirm->add_error("Both provided passwords must be equal")
+        if $confirm->value ne $pass->value;
 }
 
 1;