[mb-commits] branch, mbs-5586, updated. MBS-5586, clarify use of the post_creation and on_creation hooks.

The branch, mbs-5586 has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f0b7974de504d3b076ae09fea31f12834cfccbab (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=451b1b5ea39ae0d8460ce1176343adb68e559b86 (commit)

Summary of changes:
 lib/MusicBrainz/Server/Controller.pm               |    5 +++--
 lib/MusicBrainz/Server/Controller/Artist.pm        |    7 +++----
 t/lib/t/MusicBrainz/Server/Controller/Work/Edit.pm |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f0b7974de504d3b076ae09fea31f12834cfccbab
Author: warp <[email protected]>
Date:   Tue Jan 8 17:47:13 2013 +0100

    MBS-5586, clarify use of the post_creation and on_creation hooks.

diff --git a/lib/MusicBrainz/Server/Controller.pm b/lib/MusicBrainz/Server/Controller.pm
index 1fb4980..ce67950 100644
--- a/lib/MusicBrainz/Server/Controller.pm
+++ b/lib/MusicBrainz/Server/Controller.pm
@@ -139,11 +139,12 @@ sub edit_action
                 @options,
                 %extra
             );
-
-            $opts{post_creation}->($edit, $form) if $edit && exists $opts{post_creation};
         });
 
+        # the on_creation hook is only called when an edit was entered.
+        # the post_creation hook is always called.
         $opts{on_creation}->($edit, $form) if $edit && exists $opts{on_creation};
+        $opts{post_creation}->($edit, $form) if exists $opts{post_creation};
 
         return $edit;
     }
diff --git a/lib/MusicBrainz/Server/Controller/Artist.pm b/lib/MusicBrainz/Server/Controller/Artist.pm
index d2ac82b..1db2612 100644
--- a/lib/MusicBrainz/Server/Controller/Artist.pm
+++ b/lib/MusicBrainz/Server/Controller/Artist.pm
@@ -456,7 +456,7 @@ sub edit : Chained('load') RequireAuth Edit {
         type        => $EDIT_ARTIST_EDIT,
         item        => $artist,
         edit_args   => { to_edit => $artist },
-        post_creation => sub {
+        on_creation => sub {
             my ($edit, $form) = @_;
 
             my $editid = $edit->id;
@@ -482,8 +482,7 @@ sub edit : Chained('load') RequireAuth Edit {
                     );
                 }
             }
-        },
-        on_creation => sub {
+
             $c->res->redirect(
                 $c->uri_for_action('/artist/show', [ $artist->gid ]));
         }
@@ -622,7 +621,7 @@ sub split : Chained('load') Edit {
         type        => $EDIT_ARTIST_EDITCREDIT,
         item        => { artist_credit => $ac },
         edit_args   => { to_edit => $ac },
-        post_creation => sub {
+        on_creation => sub {
             my ($edit) = @_;
 
             my $editid = $edit->id;
diff --git a/t/lib/t/MusicBrainz/Server/Controller/Work/Edit.pm b/t/lib/t/MusicBrainz/Server/Controller/Work/Edit.pm
index de2e620..00a647a 100644
--- a/t/lib/t/MusicBrainz/Server/Controller/Work/Edit.pm
+++ b/t/lib/t/MusicBrainz/Server/Controller/Work/Edit.pm
@@ -32,8 +32,8 @@ my @edits = capture_edits {
 
 @edits = sort_by { $_->id } @edits;
 
-ok($mech->success);
-ok($mech->uri =~ qr{/work/745c079d-374e-4436-9448-da92dedef3ce$});
+ok($mech->success, 'POST request success');
+ok($mech->uri =~ qr{/work/745c079d-374e-4436-9448-da92dedef3ce$}, 'redirected to correct work page');
 html_ok($mech->content);
 
 my $edit = $edits[0];

-----------------------------------------------------------------------


hooks/post-receive
-- 
mb_server