[mb-commits] branch, beta, updated. Merge branch 'mbs-5767' into beta MBS-5767: Add an index on (editor, id DESC)
MusicBrainz Git Server <[email protected]> Mon, 28 Jan 2013 11:59:26 +0000
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1TznMz-0001vL-V6@wiley> |
The branch, beta has been updated
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0aa22d8770b2311a66046664f3347aa46a85a13c (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=36ae80882606c538239d585bcc636ddb973d3ef2 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f6b11ba42202c93211973809f82ae265d40b8c3a (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c7f7485f3a21506162983d8c4387c47f9f9d4fcf (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=0809adaf7f1d4e8e26962a382a0515309761992b (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e0bf4f89883d7f4877a66c7eae3cc889037bc284 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a24befd9f7127cb06e0d276009433d1b342b700c (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=cab46346581713e784680aff5e814b296f58ee71 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a3b89d22af49177088fbeb3999576287fe7f1372 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=718cde1ee233b5122d62b1257fa10a31d20cafdc (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=657f6ad83c2be9f8e8da94b4fc2aa84df732acb7 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=aea5a3d81fc5e740684a0df2b732c1c8d410e81a (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=2185ab7d59bf8ed836d63d68dde627908d27eb2d (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6e13713e5f1b2f7d9a6b168f332ec841ba32937b (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=26c74505ff48fe1ac73e5d2b0f70a1b440d90adb (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ec889deddd91f808e0456b92ae9d944314be85c3 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6f2454e5b694184cca26ad6493e433f3fa88652f (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=22ede9de3f40c05ff1c6d15782ce4b74ac5d0ab7 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=2a0e7264180dd98a0d490ae57041dfa11a434d62 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=fc38de64df55e24aa5f0486e8f2e95c59eaf10dd (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=7e8eae10b75afeea5ce1eb447c0cc480b5ed7cdb (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e37ff0059f11cc04c10d82e15dfcfdc3325a97eb (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f8bc1ff1db8544adabeed5ea94b05ca8e52d5ba7 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=8d884a6ee5ca7680f9bd38992b764a88ccbaf4cc (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=a06c74a7a5580eeb9b1763c9abdfcb444301a383 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=6779ec4e686b71a819560eeebff6424fdf83ce81 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f75b6a13585cbfd2de20736dd2aed7ad7bfe44d7 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c28483551e9176eeea4fcb9c22ffe62e8a2def9e (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=e4ac8106300c74bb9fabd6910a0f3e52d85b3951 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=23dafa24508e248204d9f337a8c10c392c662993 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ddb2d02b40e36f8cc4a5542d0c6625e4764c2c93 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=04f461f327ab1104d76aa31bc95f10e167d00e78 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ac821966b2820c002d5272e199dc9f39e13278f6 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ce4ae81b306abe97d97382b6f11ea484fd3018e8 (commit)
from http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=05493516cb367732ff06bbc9153fe023ec743dc7 (commit)
Summary of changes:
admin/sql/CreateConstraints.sql | 3 +
admin/sql/CreateIndexes.sql | 3 +
admin/sql/DropIndexes.sql | 1 +
.../updates/20130125-release_label-not-empty.sql | 7 +++
.../20130125-unsubscribe-to-deleted-editors.sql | 8 +++
lib/MusicBrainz/Server/Constants.pm | 5 ++-
lib/MusicBrainz/Server/Controller/Edit.pm | 47 ++++++++++--------
lib/MusicBrainz/Server/Data/Edit.pm | 23 ++++-----
lib/MusicBrainz/Server/Data/Editor.pm | 8 +++
lib/MusicBrainz/Server/Edit.pm | 14 +++++-
.../Server/Edit/Relationship/EditLinkType.pm | 14 +++++-
lib/MusicBrainz/Server/EditQueue.pm | 11 +++--
.../Server/Report/FilterForEditor/ReleaseID.pm | 8 ++-
lib/MusicBrainz/Server/Wizard/ReleaseEditor.pm | 51 ++++++++++++++++++-
.../Server/Wizard/ReleaseEditor/Edit.pm | 25 ----------
root/artist/relationships.tt | 2 +-
root/edit/details/edit_relationship_type.tt | 6 +-
root/edit/details/historic/move_disc_id.tt | 29 +++++++----
root/scripts/text_strings.tt | 3 +-
root/static/scripts/common/MB/Control/EditList.js | 2 +-
root/static/scripts/common/MB/Control/SelectAll.js | 6 ++-
root/statistics/languages_scripts.tt | 2 +-
t/lib/t/MusicBrainz/Server/Data/Editor.pm | 15 ++++++
23 files changed, 200 insertions(+), 93 deletions(-)
create mode 100644 admin/sql/updates/20130125-release_label-not-empty.sql
create mode 100644 admin/sql/updates/20130125-unsubscribe-to-deleted-editors.sql
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 0aa22d8770b2311a66046664f3347aa46a85a13c
Merge: 36ae808 ce4ae81
Author: Oliver Charles <[email protected]>
Date: Mon Jan 28 11:58:43 2013 +0000
Merge branch 'mbs-5767' into beta
* mbs-5767:
MBS-5767: Add an index on (editor, id DESC)
commit 36ae80882606c538239d585bcc636ddb973d3ef2
Merge: f6b11ba ac82196
Author: Oliver Charles <[email protected]>
Date: Mon Jan 28 11:58:10 2013 +0000
Merge branch 'mbs-5764' into beta
* mbs-5764:
MBS-5764: The 'works' column in the 'Languages' stats should link to a work search
commit f6b11ba42202c93211973809f82ae265d40b8c3a
Merge: c7f7485 04f461f
Author: Oliver Charles <[email protected]>
Date: Mon Jan 28 11:57:35 2013 +0000
Merge branch 'mbs-5754' into beta
* mbs-5754:
MBS-5754: Allow copying track changes to recordings when adding new releases
commit c7f7485f3a21506162983d8c4387c47f9f9d4fcf
Merge: 0809ada ddb2d02
Author: Oliver Charles <[email protected]>
Date: Mon Jan 28 11:57:03 2013 +0000
Merge branch 'mbs-5750' into beta
* mbs-5750:
MBS-5750: When filtering reports by subscriptions, also account for label subscriptions
commit 0809adaf7f1d4e8e26962a382a0515309761992b
Merge: e0bf4f8 23dafa2
Author: Oliver Charles <[email protected]>
Date: Mon Jan 28 11:56:31 2013 +0000
Merge branch 'mbs-5525' into beta
* mbs-5525:
MBS-5525: Correctly display parent changes in 'edit relationship type' edits
commit e0bf4f89883d7f4877a66c7eae3cc889037bc284
Merge: a24befd e4ac810
Author: Oliver Charles <[email protected]>
Date: Mon Jan 28 11:55:55 2013 +0000
Merge branch 'mbs-5748' into beta
* mbs-5748:
MBS-5748: Only require an edit note during approval if other editors voted no
Conflicts:
lib/MusicBrainz/Server/Controller/Edit.pm
diff --cc lib/MusicBrainz/Server/Controller/Edit.pm
index 5d2c81b,cd5a63a..6eebb46
--- a/lib/MusicBrainz/Server/Controller/Edit.pm
+++ b/lib/MusicBrainz/Server/Controller/Edit.pm
@@@ -88,32 -88,30 +88,34 @@@ sub approve : Chained('load') RequireAu
{
my ($self, $c) = @_;
- my $edit = $c->stash->{edit};
- if (!$edit->can_approve($c->user)) {
- $c->stash( template => 'edit/cannot_approve.tt' );
- $c->detach;
- }
+ $c->model('MB')->with_transaction(sub {
+ my $edit = $c->model('Edit')->get_by_id_and_lock($c->stash->{edit}->id);
++ $c->model('Vote')->load_for_edits($edit);
+
- $c->model('Vote')->load_for_edits($edit);
- if($edit->approval_requires_comment($c->user)) {
- $c->model('EditNote')->load_for_edits($edit);
- my $left_note;
- for my $note (@{ $edit->edit_notes }) {
- next if $note->editor_id != $c->user->id;
- $left_note = 1;
- last;
+ if (!$edit->can_approve($c->user)) {
+ $c->stash( template => 'edit/cannot_approve.tt' );
+ return;
}
- elsif($edit->no_votes > 0) {
-
- unless($left_note) {
- $c->stash( template => 'edit/require_note.tt' );
- $c->detach;
- };
- }
-
- $c->model('Edit')->approve($edit, $c->user->id);
- $c->response->redirect($c->req->query_params->{url} || $c->uri_for_action('/edit/show', [ $edit->id ]));
++ elsif($edit->approval_requires_comment($c->user)) {
+ $c->model('EditNote')->load_for_edits($edit);
+ my $left_note;
+ for my $note (@{ $edit->edit_notes }) {
+ next if $note->editor_id != $c->user->id;
+ $left_note = 1;
+ last;
+ }
+
+ unless($left_note) {
+ $c->stash( template => 'edit/require_note.tt' );
+ return;
+ };
+ }
+ else {
+ $c->model('Edit')->approve($edit, $c->user->id);
+ $c->response->redirect(
+ $c->req->query_params->{url} || $c->uri_for_action('/edit/show', [ $edit->id ]));
+ }
+ });
}
sub cancel : Chained('load') RequireAuth
commit a24befd9f7127cb06e0d276009433d1b342b700c
Merge: cab4634 c284835
Author: Oliver Charles <[email protected]>
Date: Mon Jan 28 11:50:34 2013 +0000
Merge branch 'mbs-5740' into beta
* mbs-5740:
MBS-5740: Only show the 'select all' checkbox if the table contains checkboxes
commit cab46346581713e784680aff5e814b296f58ee71
Merge: a3b89d2 f75b6a1
Author: Oliver Charles <[email protected]>
Date: Mon Jan 28 11:49:50 2013 +0000
Merge branch 'mbs-5705' into beta
* mbs-5705:
MBS-5705: Fix colspan on the artist 'appearances' tables
commit a3b89d22af49177088fbeb3999576287fe7f1372
Merge: 718cde1 6779ec4
Author: Oliver Charles <[email protected]>
Date: Mon Jan 28 11:49:24 2013 +0000
Merge branch 'mbs-5770' into beta
* mbs-5770:
MBS-5770: Ensure that release_labels row have at least a catalog number or a label
commit 718cde1ee233b5122d62b1257fa10a31d20cafdc
Merge: aea5a3d 657f6ad
Author: Oliver Charles <[email protected]>
Date: Mon Jan 28 11:49:03 2013 +0000
Merge branch 'mbs-5700' into beta
* mbs-5700:
MBS-5700: When an editor deletes their account, unsubscribe anyone subscribed to them
commit aea5a3d81fc5e740684a0df2b732c1c8d410e81a
Merge: 2185ab7 a06c74a
Author: Oliver Charles <[email protected]>
Date: Mon Jan 28 11:47:05 2013 +0000
Merge branch 'mbs-5698' into beta
* mbs-5698:
MBS-5698: Display historic 'move disc ID' edits correctly
commit 2185ab7d59bf8ed836d63d68dde627908d27eb2d
Merge: 6e13713 8d884a6
Author: Oliver Charles <[email protected]>
Date: Mon Jan 28 11:45:13 2013 +0000
Merge branch 'mbs-5774' into beta
* mbs-5774:
MBS-5774: Make 'vote on all edits' text translatable
commit 6e13713e5f1b2f7d9a6b168f332ec841ba32937b
Merge: 26c7450 f8bc1ff
Author: Oliver Charles <[email protected]>
Date: Mon Jan 28 11:45:04 2013 +0000
Merge branch 'mbs-5655' into beta
* mbs-5655:
MBS-5655: Discard release labels in the RE if they have no data
commit 26c74505ff48fe1ac73e5d2b0f70a1b440d90adb
Merge: ec889de e37ff00
Author: Oliver Charles <[email protected]>
Date: Mon Jan 28 11:44:47 2013 +0000
Merge branch 'mbs-5650' into beta
* mbs-5650:
MBS-5650: Extend edit approval transaction boundaries over race condition
-----------------------------------------------------------------------
hooks/post-receive
--
mb_server