[mb-commits] branch, mbs-4627, updated. MBS-4627, use the correct image identifier in Edit::Role::CoverArt-> adjust_ed...

MusicBrainz Git Server <[email protected]>
Newsgroups gmane.comp.audio.musicbrainz.cvs
Message-ID <E1Tfuwq-0001Ro-MF@wiley>
The branch, mbs-4627 has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=088949f2d1da2dc4d5064b634956171b848118e1 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=667064ed94d95f4a5cb04d28cadf59079440266f (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=996b98e04cea6273affa1b7f0cccb4a79a4807d7 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0aba31b680eae3536cd26ddbbeb3ac3eed372b44 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6dcdf502fba3ef243a36ad1173b4bd6fc4347124 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d51cbf633f45ac520f3b4483c560018bf2cb97c6 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3faab2fe5efa077ce31c75286717281c7a30d8a0 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=2725614e17c5a0568899de4a5a57522a603a3df6 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e7339ebc0e8aac82de637cd9bba8ebbd7568c00f (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ade18f54a5fca12010837b8652a9a2e2ef758e39 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=4f36845715e03ac703834801e921482824c1f3e5 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=700cc933433afa813664c4309c7ab4d9c0f86e19 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6242ff3f09a0d21cbd5521663563acce513e5b60 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=9f2f6ab205b3b0ee82a693e77f81b46dec52055b (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c61b91e8dd4d9fa6b38b63629a0dac93707b8a12 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8db4b158999c01406e8fe4355cc7bca3b86567a1 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0b1c0cacea1da53a90002a702a81e084f8611240 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=01e0776e9ec1d14a5dc5ca70c4ee58a5414f62a5 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=27efab45366a425f149ff21962cfacc4cb0ae6ba (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e8f989549ada11be3537bac70a3d25cd636fa1db (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e345dac5323541daadf3f294918ee40f15039815 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f96681bef1b40cd1e95cd5cf8edbbfe342c8fc47 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ef1078f69fa847a38aef4032b041816ab8db9f53 (commit)

Summary of changes:
 HACKING-CAA.md                                     |    2 +-
 lib/MusicBrainz/Server/Constants.pm                |    3 +-
 lib/MusicBrainz/Server/Controller/ReleaseGroup.pm  |   56 +++++++-
 lib/MusicBrainz/Server/Data/Artwork.pm             |   81 +++++++++++
 lib/MusicBrainz/Server/Data/Release.pm             |    5 +
 lib/MusicBrainz/Server/Data/ReleaseGroup.pm        |   81 +++++++++++
 lib/MusicBrainz/Server/Data/Utils.pm               |    3 +-
 .../Server/Edit/ReleaseGroup/SetCoverArt.pm        |  151 ++++++++++++++++++++
 lib/MusicBrainz/Server/Edit/Role/CoverArt.pm       |    4 +-
 lib/MusicBrainz/Server/EditRegistry.pm             |    1 +
 lib/MusicBrainz/Server/Entity/Artwork.pm           |    6 +-
 lib/MusicBrainz/Server/Entity/ReleaseGroup.pm      |    9 ++
 .../SetCoverArt.pm}                                |   19 ++-
 root/edit/details/set_cover_art.tt                 |   49 +++++++
 root/release_group/layout.tt                       |   15 ++
 root/release_group/set_cover_art.tt                |   58 ++++++++
 root/static/styles/edit.css                        |   33 +++++
 .../t/MusicBrainz/Server/Controller/Work/Create.pm |    4 +-
 t/lib/t/MusicBrainz/Server/Data/ReleaseGroup.pm    |   67 +++++++++
 .../Server/Edit/ReleaseGroup/SetCoverArt.pm        |   80 +++++++++++
 t/sql/caa.sql                                      |    2 +
 21 files changed, 713 insertions(+), 16 deletions(-)
 create mode 100644 lib/MusicBrainz/Server/Edit/ReleaseGroup/SetCoverArt.pm
 copy lib/MusicBrainz/Server/Form/{Release/EditCoverArt.pm => ReleaseGroup/SetCoverArt.pm} (73%)
 create mode 100644 root/edit/details/set_cover_art.tt
 create mode 100644 root/release_group/set_cover_art.tt
 create mode 100644 t/lib/t/MusicBrainz/Server/Edit/ReleaseGroup/SetCoverArt.pm

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 088949f2d1da2dc4d5064b634956171b848118e1
Author: warp <[email protected]>
Date:   Tue Dec 4 17:01:25 2012 +0100

    MBS-4627, use the correct image identifier in Edit::Role::CoverArt->adjust_edit_pending().

diff --git a/lib/MusicBrainz/Server/Edit/Role/CoverArt.pm b/lib/MusicBrainz/Server/Edit/Role/CoverArt.pm
index cdebec8..8aa8395 100644
--- a/lib/MusicBrainz/Server/Edit/Role/CoverArt.pm
+++ b/lib/MusicBrainz/Server/Edit/Role/CoverArt.pm
@@ -6,8 +6,8 @@ sub alter_edit_pending {
 
     return {
         Release => [ $self->release_ids ],
-        Artwork => [ $self->data->{id} ],
-    }
+        Artwork => [ $self->data->{cover_art_id} // $self->data->{id} ],
+    };
 }
 
 no Moose::Role;

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


hooks/post-receive
-- 
mb_server
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.