[mb-commits] r10102 - in mb_server/branches/TemplateToolkit: lib/MusicBrainz/Server lib/MusicBrainz/Server/Controller lib/MusicBrainz/Server/Form lib/MusicBrainz/Server/Form/Field lib/MusicBrainz/Server/Form/Model root/artist root/forms

[root at musicbrainz.org]

Author: acid2
Date: 2008-07-14 15:59:24 +0000 (Mon, 14 Jul 2008)
New Revision: 10102

Added:
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form.pm
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Artist.pm
Removed:
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Artist/
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Model/Artist.pm
Modified:
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Field/Date.pm
   mb_server/branches/TemplateToolkit/root/artist/edit.tt
   mb_server/branches/TemplateToolkit/root/forms/edit-note.tt
Log:
Editing artist data

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm	2008-07-14 05:46:47 UTC (rev 10101)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/Artist.pm	2008-07-14 15:59:24 UTC (rev 10102)
@@ -72,24 +72,18 @@
     my ($self, $c, $mbid) = @_;
     my $artist = $c->stash->{_artist};
 
-    use MusicBrainz::Server::Form::Artist::Edit;
+    use MusicBrainz::Server::Form::Artist;
 
-    my $form = new MusicBrainz::Server::Form::Artist::Edit($artist->GetId);
+    my $form = new MusicBrainz::Server::Form::Artist($artist->GetId);
+    $form->context($c);
     $c->stash->{form} = $form;
 
     if($c->form_posted)
     {
-        if($form->validate($c->req->params))
+        if ($form->update_from_form($c->req->params))
         {
-            # TODO BUG ERROR OMG WTF R U DOING.
-            # Still need to validate the date field and stuff
-
-            Moderation->Insert( DBH => $c->mb->{DBH},
-                                uid => $c->user->get_object->GetId,
-                                type => ModDefs::MOD_EDIT_ARTIST,
-                                artist => $artist,
-                                name => $artist->GetName,
-                                sortname => $artist->GetSortName );
+            $c->flash->{ok} = "Thanks, your artist edit has been entered into the moderation queue";
+            $c->detach('/artist/show', $mbid);
         }
     }
 

Added: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Artist.pm

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Field/Date.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Field/Date.pm	2008-07-14 05:46:47 UTC (rev 10101)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Field/Date.pm	2008-07-14 15:59:24 UTC (rev 10102)
@@ -10,8 +10,14 @@
 sub init_widget { 'date' }
 
 sub input_to_value {
-    my $self = shift;
-    $self->value("This?");
+    my ($self, %date) = @_;
+    $self->value(
+        MusicBrainz::Server::Validation::MakeDBDateStr(
+            $date{year},
+            $date{month},
+            $date{day}
+        )
+    );
 }
 
 sub validate_field {
@@ -34,25 +40,19 @@
         $date{$field} = $value;
     }
 
-    # Store the date - this is used to display in the HTML form
-    $self->{date} = \%date;
-
     if ($self->required && !($date{year}))
     {
-        $self->add_error("This field is required");
+        $self->add_error($self->required_text);
         return;
     }
 
     unless(MusicBrainz::Server::Validation::IsValidDateOrEmpty($date{year}, $date{month}, $date{day}))
     {
-        use Data::Dumper;
-        die Dumper \%date;
-
         $self->add_error('Invalid date');
         return;
     }
 
-    $self->input_to_value;
+    $self->input_to_value(%date);
 
     1;
 }

Deleted: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form/Model/Artist.pm

Added: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Form.pm

Modified: mb_server/branches/TemplateToolkit/root/artist/edit.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/artist/edit.tt	2008-07-14 05:46:47 UTC (rev 10101)
+++ mb_server/branches/TemplateToolkit/root/artist/edit.tt	2008-07-14 15:59:24 UTC (rev 10102)
@@ -27,6 +27,10 @@
 
   [% INCLUDE "forms/widget.tt" widget=form.field("start") label="Start" %]
   [% INCLUDE "forms/widget.tt" widget=form.field("end") label="End" %]
+
+  [%- IF form.field("resolution").required -%]
+    [% INCLUDE "forms/widget.tt" widget=form.field("resolution") label="Resolution" %]
+  [%- END -%]
  
   [% INCLUDE "forms/edit-note.tt" %]
   [% INCLUDE "forms/submit.tt" label="Update" %]

Modified: mb_server/branches/TemplateToolkit/root/forms/edit-note.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/forms/edit-note.tt	2008-07-14 05:46:47 UTC (rev 10101)
+++ mb_server/branches/TemplateToolkit/root/forms/edit-note.tt	2008-07-14 15:59:24 UTC (rev 10102)
@@ -1,4 +1,4 @@
-[%- DEFAULT field=form.field("editNote") -%]
+[%- DEFAULT field=form.field("edit_note") -%]
 <p>
     <label for="id_[% field.name %]" class="[% field.required_text %]">Edit Note:</label>
     <textarea></textarea>