[mb-commits] branch, beta, updated. Merge remote-tracking branch 'origin/mbs-4376' into beta MBS-4376, fix typo (...
MusicBrainz Git Server <[email protected]>
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1TfTSa-00011h-1T@wiley> |
The branch, beta has been updated
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0b9d0e4a2abd3494c06bd0a289e491023fe3bb6b (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=762720ddafae7e6a2711d7b890b785341fa6a122 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=066e21b2f70d7364a9df0e95b3aed8bdda11f021 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e40b130608ddbae615ff9cb8480e7b194a2385b7 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e92e38417665eac1b426e887448cfac2e02862aa (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d9fddf73e66a64268bcdc3124451490df41c57c6 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=71f5978d61bfdedb68660ef7ac8e72eaed07cf24 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6027b1521b2273d5d980c01ac9dcdb4dc2736d43 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e1f732d0a6030102f0e2d9c2b2ff51e1561be7bc (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=4aa6715db0a0aa0be285cba5206a4502e47d11be (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=62d5846b07e3ffae3da55891de37013adffc308a (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a240caf306a75c3a2aec521a0da7c5de7f39f8ca (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=dce7b60b89d56545ba1bc704c0a6a7f2e97648e5 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=aa5d506c026b89cd246657e7343116405c026f65 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=381e8fcc85a3d1703310f4f3a26b37b041261f87 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=86cb4adfd943c4da4c96a16336f1fc56ec7c7873 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=bad8d1fb74c80c512193b4fb0d77c7e4a252efa4 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ddc8c46151b44cef69a5a1e32b92527374fb5be2 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=67164c7bc404df02c43a805eae6076750db5c631 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=843059f6f66cf4a49649a8749152ec65a43e6ed4 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0fc0b5a7bfb5f946a9dea2c8516eb290a16675b3 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f2d2165298ff641290cc93835f64297824f4729b (commit)
from http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=d816f942c0e6431c7d00df3244a3781bcc4ebe37 (commit)
Summary of changes:
lib/MusicBrainz/Server/Controller/Release.pm | 47 ++++-
.../Server/Controller/WS/2/Annotation.pm | 56 +++++
lib/MusicBrainz/Server/Controller/WS/js.pm | 20 ++
lib/MusicBrainz/Server/Data/Artwork.pm | 6 +-
lib/MusicBrainz/Server/Data/CoverArtArchive.pm | 9 +-
lib/MusicBrainz/Server/Data/CoverArtType.pm | 16 ++-
.../WebService/Serializer/JSON/2/ReleaseGroup.pm | 3 +-
root/artist/layout.tt | 4 +-
root/components/forms.tt | 2 +-
root/label/layout.tt | 4 +-
root/recording/layout.tt | 4 +-
root/release/add_cover_art.tt | 129 +++++++++---
root/release/sidebar.tt | 4 +-
root/release_group/layout.tt | 20 +--
root/release_group/set_cover_art.tt | 6 +-
root/static/edit.js.manifest | 1 +
root/static/images/diagonals-purple.png | Bin 0 -> 295 bytes
root/static/images/newimagesgohere-125.png | Bin 0 -> 2833 bytes
...{newimagegoeshere.html => newimagesgohere.html} | 4 +-
root/static/lib/filesize.js/README.md | 21 ++
root/static/lib/filesize.js/debug/filesize.js | 97 +++++++++
root/static/lib/filesize.js/package.json | 18 ++
root/static/lib/filesize.js/production/filesize.js | 42 ++++
root/static/lib/libraries.txt | 8 +
root/static/scripts/common/MB/utility.js | 42 ++++
root/static/scripts/edit/MB/CoverArt.js | 221 +++++++++++++++++++-
root/static/styles/forms.css | 43 ++++
root/url/layout.tt | 4 +-
root/work/layout.tt | 4 +-
29 files changed, 750 insertions(+), 85 deletions(-)
create mode 100644 lib/MusicBrainz/Server/Controller/WS/2/Annotation.pm
create mode 100644 root/static/images/diagonals-purple.png
create mode 100644 root/static/images/newimagesgohere-125.png
copy root/static/images/src/{newimagegoeshere.html => newimagesgohere.html} (95%)
create mode 100644 root/static/lib/filesize.js/README.md
create mode 100644 root/static/lib/filesize.js/debug/filesize.js
create mode 100644 root/static/lib/filesize.js/package.json
create mode 100644 root/static/lib/filesize.js/production/filesize.js
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 0b9d0e4a2abd3494c06bd0a289e491023fe3bb6b
Merge: 762720d 381e8fc
Author: warp <[email protected]>
Date: Mon Dec 3 11:40:56 2012 +0100
Merge remote-tracking branch 'origin/mbs-4376' into beta
* origin/mbs-4376:
MBS-4376, fix typo ("your edits has been ..." -> "your edits have been ...")
MBS-4376, add up/down buttons to reorder images in the multiple file upload.
MBS-4376, sort cover art types in Data::CoverArtType.
MBS-4376, improve error handling of image uploads and set position correctly in add cover art edits.
Upgrade jQuery to 1.7.2.
MBS-4376, preliminary xmlhttprequest cover art uploads.
Conflicts:
lib/MusicBrainz/Server/Data/CoverArtType.pm
diff --cc lib/MusicBrainz/Server/Data/CoverArtType.pm
index 073f5ad,9b0f8c8..372d003
--- a/lib/MusicBrainz/Server/Data/CoverArtType.pm
+++ b/lib/MusicBrainz/Server/Data/CoverArtType.pm
@@@ -40,41 -40,19 +41,54 @@@ sub get_by_nam
return map { $types_by_name{$_} } @names;
}
+sub find_by_cover_art_ids
+{
+ my ($self, @ids) = @_;
+ return () unless @ids;
+
+ my $query = "SELECT cover_art_type.id AS cover_art_id, " . $self->_columns . " " .
+ "FROM " . $self->_table . " " .
+ "JOIN cover_art_archive.cover_art_type " .
+ "ON cover_art_type.type_id = art_type.id " .
+ "WHERE cover_art_type.id IN (" . placeholders(@ids) . ")";
+
+ my %map;
+ $self->sql->select($query, @ids);
+ while (my $row = $self->sql->next_row_hash_ref) {
+
+ $map{ $row->{cover_art_id} } ||= [];
+ push @{ $map{ $row->{cover_art_id} } }, $self->_new_from_row ($row);
+ }
+
+ return %map;
+}
+
+sub load_for
+{
+ my ($self, @objects) = @_;
+ my %obj_id_map = object_to_ids(@objects);
+
+ my %id_types_map = $self->find_by_cover_art_ids (keys %obj_id_map);
+
+ while (my ($cover_art_id, $types) = each %id_types_map)
+ {
+ $obj_id_map{$cover_art_id}[0]->cover_art_types ($types);
+ }
+}
+
+ sub get_all
+ {
+ my $self = shift;
+
+ my %types_by_name = map { $_->name => $_ } $self->_select_all ();
+
+ my $front = delete $types_by_name{Front};
+ my $back = delete $types_by_name{Back};
+ my $other = delete $types_by_name{Other};
+
+ return ($front, $back, values %types_by_name, $other);
+ }
+
__PACKAGE__->meta->make_immutable;
no Moose;
1;
commit 762720ddafae7e6a2711d7b890b785341fa6a122
Merge: 066e21b 62d5846
Author: warp <[email protected]>
Date: Mon Dec 3 11:40:20 2012 +0100
Merge remote-tracking branch 'origin/mbs-5612' into beta
* origin/mbs-5612:
MBS-5612, revert the changes to load_for_release_groups in the previous commit, the previous sort behaviour was correct.
MBS-5612, Sort releases correctly when picking release group cover art.
commit 066e21b2f70d7364a9df0e95b3aed8bdda11f021
Merge: e40b130 e1f732d
Author: warp <[email protected]>
Date: Mon Dec 3 11:40:17 2012 +0100
Merge remote-tracking branch 'origin/mbs-5610' into beta
* origin/mbs-5610:
MBS-5610, always display "Set cover art" link, remove "Remove release group" link.
MBS-5610, Move "Set cover art" link to the correct section.
commit e40b130608ddbae615ff9cb8480e7b194a2385b7
Merge: e92e384 dce7b60
Author: warp <[email protected]>
Date: Mon Dec 3 11:40:14 2012 +0100
Merge remote-tracking branch 'origin/mbs-5616' into beta
* origin/mbs-5616:
MBS-5616, move "set cover art" from label to h1.
commit e92e38417665eac1b426e887448cfac2e02862aa
Merge: d9fddf7 6027b15
Author: warp <[email protected]>
Date: Mon Dec 3 11:40:09 2012 +0100
Merge remote-tracking branch 'origin/mbs-3308' into beta
* origin/mbs-3308:
MBS-3308, always display "Open edits" link.
commit d9fddf73e66a64268bcdc3124451490df41c57c6
Merge: 71f5978 4aa6715
Author: warp <[email protected]>
Date: Mon Dec 3 11:40:04 2012 +0100
Merge remote-tracking branch 'origin/mbs-5607' into beta
* origin/mbs-5607:
MBS-5607, don't crash when serializing a release group without a primary type for json /ws/2.
commit 71f5978d61bfdedb68660ef7ac8e72eaed07cf24
Merge: d816f94 86cb4ad
Author: warp <[email protected]>
Date: Mon Dec 3 11:39:54 2012 +0100
Merge remote-tracking branch 'origin/mbs-3840' into beta
* origin/mbs-3840:
MBS-3840, Add glue to make /ws/2/annotation searches available.
-----------------------------------------------------------------------
hooks/post-receive
--
mb_server