[mb-commits] branch, mbs-4627, updated. MBS-4627, add -> cover_art_id method to cover art edit classes to avoid having...

The branch, mbs-4627 has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5d2dc8cd7c3814b64786c9b80d84984b163166a3 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=088949f2d1da2dc4d5064b634956171b848118e1 (commit)

Summary of changes:
 lib/MusicBrainz/Server/Edit/Release/AddCoverArt.pm |    1 +
 .../Server/Edit/Release/EditCoverArt.pm            |    1 +
 .../Server/Edit/Release/RemoveCoverArt.pm          |    1 +
 lib/MusicBrainz/Server/Edit/Role/CoverArt.pm       |   19 ++++++++++++-------
 4 files changed, 15 insertions(+), 7 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 5d2dc8cd7c3814b64786c9b80d84984b163166a3
Author: warp <[email protected]>
Date:   Tue Dec 11 15:44:42 2012 +0100

    MBS-4627, add ->cover_art_id method to cover art edit classes to avoid having to know these details in Edit::Role::CoverArt.

diff --git a/lib/MusicBrainz/Server/Edit/Release/AddCoverArt.pm b/lib/MusicBrainz/Server/Edit/Release/AddCoverArt.pm
index 893ff26..611725c 100644
--- a/lib/MusicBrainz/Server/Edit/Release/AddCoverArt.pm
+++ b/lib/MusicBrainz/Server/Edit/Release/AddCoverArt.pm
@@ -19,6 +19,7 @@ with 'MusicBrainz::Server::Edit::Role::CoverArt';
 sub edit_name { N_l('Add cover art') }
 sub edit_type { $EDIT_RELEASE_ADD_COVER_ART }
 sub release_ids { shift->data->{entity}{id} }
+sub cover_art_id { shift->data->{cover_art_id} }
 
 has '+data' => (
     isa => Dict[
diff --git a/lib/MusicBrainz/Server/Edit/Release/EditCoverArt.pm b/lib/MusicBrainz/Server/Edit/Release/EditCoverArt.pm
index 08513dc..2aeb884 100644
--- a/lib/MusicBrainz/Server/Edit/Release/EditCoverArt.pm
+++ b/lib/MusicBrainz/Server/Edit/Release/EditCoverArt.pm
@@ -20,6 +20,7 @@ with 'MusicBrainz::Server::Edit::Role::CoverArt';
 sub edit_name { N_l('Edit cover art') }
 sub edit_type { $EDIT_RELEASE_EDIT_COVER_ART }
 sub release_ids { shift->data->{entity}{id} }
+sub cover_art_id { shift->data->{id} }
 
 sub change_fields
 {
diff --git a/lib/MusicBrainz/Server/Edit/Release/RemoveCoverArt.pm b/lib/MusicBrainz/Server/Edit/Release/RemoveCoverArt.pm
index ccadc74..de78be7 100644
--- a/lib/MusicBrainz/Server/Edit/Release/RemoveCoverArt.pm
+++ b/lib/MusicBrainz/Server/Edit/Release/RemoveCoverArt.pm
@@ -18,6 +18,7 @@ with 'MusicBrainz::Server::Edit::Role::CoverArt';
 sub edit_name { N_l('Remove cover art') }
 sub edit_type { $EDIT_RELEASE_REMOVE_COVER_ART }
 sub release_ids { shift->data->{entity}{id} }
+sub cover_art_id { shift->data->{cover_art_id} }
 
 has '+data' => (
     isa => Dict[
diff --git a/lib/MusicBrainz/Server/Edit/Role/CoverArt.pm b/lib/MusicBrainz/Server/Edit/Role/CoverArt.pm
index 8aa8395..c195591 100644
--- a/lib/MusicBrainz/Server/Edit/Role/CoverArt.pm
+++ b/lib/MusicBrainz/Server/Edit/Role/CoverArt.pm
@@ -1,14 +1,19 @@
 package MusicBrainz::Server::Edit::Role::CoverArt;
-use Moose::Role;
+use MooseX::Role::Parameterized;
 
-sub alter_edit_pending {
-    my $self = shift;
+role
+{
+    requires qw( cover_art_id release_ids);
 
-    return {
-        Release => [ $self->release_ids ],
-        Artwork => [ $self->data->{cover_art_id} // $self->data->{id} ],
+    method 'alter_edit_pending' => sub {
+        my $self = shift;
+
+        return {
+            Release => [ $self->release_ids ],
+            Artwork => [ $self->cover_art_id ],
+        };
     };
-}
+};
 
 no Moose::Role;
 1;

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


hooks/post-receive
-- 
mb_server