[mb-commits] r9757 - in mb_server/branches/terminology: cgi-bin cgi-bin/MusicBrainz/Server/Moderation htdocs/comp/layout htdocs/comp/moderation htdocs/comp/release_editor htdocs/edit/album
root at musicbrainz.org
root at musicbrainz.org
Mon Mar 10 17:36:49 UTC 2008
Author: luks
Date: 2008-03-10 17:36:49 +0000 (Mon, 10 Mar 2008)
New Revision: 9757
Added:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_RELEASE.pm
mb_server/branches/terminology/htdocs/comp/moderation/MOD_MOVE_RELEASE
Removed:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_ALBUM.pm
mb_server/branches/terminology/htdocs/comp/moderation/MOD_MOVE_ALBUM
Modified:
mb_server/branches/terminology/cgi-bin/ModDefs.pm
mb_server/branches/terminology/cgi-bin/Moderation.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MAC_TO_SAC.pm
mb_server/branches/terminology/htdocs/comp/layout/editformbegin
mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit
mb_server/branches/terminology/htdocs/comp/release_editor/review
mb_server/branches/terminology/htdocs/edit/album/move.html
Log:
s/MOD_MOVE_ALBUM/MOD_MOVE_RELEASE/
Modified: mb_server/branches/terminology/cgi-bin/ModDefs.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/ModDefs.pm 2008-03-10 17:34:38 UTC (rev 9756)
+++ mb_server/branches/terminology/cgi-bin/ModDefs.pm 2008-03-10 17:36:49 UTC (rev 9757)
@@ -80,7 +80,7 @@
use constant MOD_EDIT_TRACKNUM => 5;
use constant MOD_MERGE_ARTIST => 6;
use constant MOD_ADD_TRACK => 7;
-use constant MOD_MOVE_ALBUM => 8;
+use constant MOD_MOVE_RELEASE => 8;
use constant MOD_SAC_TO_MAC => 9;
use constant MOD_CHANGE_TRACK_ARTIST => 10;
use constant MOD_REMOVE_TRACK => 11;
@@ -315,7 +315,7 @@
MOD_MERGE_RELEASE_MAC . "" => {'category' => CAT_DEPENDS, 'criteria' => "Highest level of release or new artist"},
MOD_MERGE_ARTIST . "" => {'category' => CAT_ARTIST, 'criteria' => "Level of artist with highest level"},
MOD_MERGE_LABEL . "" => {'category' => CAT_NONE, 'criteria' => ""},
- MOD_MOVE_ALBUM . "" => {'category' => CAT_DEPENDS, 'criteria' => "Highest level of release, current artist or new artist"},
+ MOD_MOVE_RELEASE . "" => {'category' => CAT_DEPENDS, 'criteria' => "Highest level of release, current artist or new artist"},
MOD_MOVE_DISCID . "" => {'category' => CAT_RELEASE, 'criteria' => "Level of release with highest level"},
MOD_REMOVE_RELEASE . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
MOD_REMOVE_RELEASES . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
Modified: mb_server/branches/terminology/cgi-bin/Moderation.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-10 17:34:38 UTC (rev 9756)
+++ mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-10 17:36:49 UTC (rev 9757)
@@ -81,7 +81,7 @@
require MusicBrainz::Server::Moderation::MOD_MERGE_ARTIST;
require MusicBrainz::Server::Moderation::MOD_MERGE_LABEL;
# require MusicBrainz::Server::Moderation::MOD_MERGE_LINK_TYPE; -- not implemented
-require MusicBrainz::Server::Moderation::MOD_MOVE_ALBUM;
+require MusicBrainz::Server::Moderation::MOD_MOVE_RELEASE;
require MusicBrainz::Server::Moderation::MOD_MOVE_DISCID;
require MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASE;
require MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASES;
@@ -118,8 +118,8 @@
name => &MusicBrainz::Server::Moderation::MOD_MERGE_ARTIST::Name() },
MOD_ADD_TRACK ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_TRACK::Name() },
- MOD_MOVE_ALBUM ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_MOVE_ALBUM::Name() },
+ MOD_MOVE_RELEASE ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_MOVE_RELEASE::Name() },
MOD_SAC_TO_MAC ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_SAC_TO_MAC::Name() },
MOD_CHANGE_TRACK_ARTIST ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -242,8 +242,8 @@
name => &MusicBrainz::Server::Moderation::MOD_MERGE_ARTIST::Name() },
MOD_ADD_TRACK ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_TRACK::Name() },
- MOD_MOVE_ALBUM ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_MOVE_ALBUM::Name() },
+ MOD_MOVE_RELEASE ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_MOVE_RELEASE::Name() },
MOD_SAC_TO_MAC ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_SAC_TO_MAC::Name() },
MOD_CHANGE_TRACK_ARTIST ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -366,8 +366,8 @@
name => &MusicBrainz::Server::Moderation::MOD_MERGE_ARTIST::Name() },
MOD_ADD_TRACK ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_ADD_TRACK::Name() },
- MOD_MOVE_ALBUM ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_MOVE_ALBUM::Name() },
+ MOD_MOVE_RELEASE ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_MOVE_RELEASE::Name() },
MOD_SAC_TO_MAC ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_SAC_TO_MAC::Name() },
MOD_CHANGE_TRACK_ARTIST ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MAC_TO_SAC.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MAC_TO_SAC.pm 2008-03-10 17:34:38 UTC (rev 9756)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MAC_TO_SAC.pm 2008-03-10 17:36:49 UTC (rev 9757)
@@ -34,7 +34,7 @@
sub Name { "Convert Release to Single Artist" }
(__PACKAGE__)->RegisterHandler;
-# PLEASE NOTE that MOD_MOVE_ALBUM is almost exactly the same as MOD_MAC_TO_SAC
+# PLEASE NOTE that MOD_MOVE_RELEASE is almost exactly the same as MOD_MAC_TO_SAC
sub PreInsert
{
Deleted: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_ALBUM.pm
Copied: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_RELEASE.pm (from rev 9732, mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MOVE_ALBUM.pm)
Modified: mb_server/branches/terminology/htdocs/comp/layout/editformbegin
===================================================================
--- mb_server/branches/terminology/htdocs/comp/layout/editformbegin 2008-03-10 17:34:38 UTC (rev 9756)
+++ mb_server/branches/terminology/htdocs/comp/layout/editformbegin 2008-03-10 17:36:49 UTC (rev 9757)
@@ -222,7 +222,7 @@
}
# move release
- elsif ($mp_type == &ModDefs::MOD_MOVE_ALBUM)
+ elsif ($mp_type == &ModDefs::MOD_MOVE_RELEASE)
{
# since we cannot say which type of edit we have (the modpending flag
# doesn't tell), link to the general EditType document.
Deleted: mb_server/branches/terminology/htdocs/comp/moderation/MOD_MOVE_ALBUM
Copied: mb_server/branches/terminology/htdocs/comp/moderation/MOD_MOVE_RELEASE (from rev 9732, mb_server/branches/terminology/htdocs/comp/moderation/MOD_MOVE_ALBUM)
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit 2008-03-10 17:34:38 UTC (rev 9756)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit 2008-03-10 17:36:49 UTC (rev 9757)
@@ -90,7 +90,7 @@
# different track artists than the release artist.
my $movetracks = 0;
- # MOD_MOVE_ALBUM
+ # MOD_MOVE_RELEASE
# if the album needs to be moved to an existing artist, or
# if the insert mod above was successful, continue moving the
# album to the newly created artist
@@ -115,7 +115,7 @@
DBH => $mb->{DBH},
uid => $session{uid},
privs => $session{privs},
- type => &ModDefs::MOD_MOVE_ALBUM,
+ type => &ModDefs::MOD_MOVE_RELEASE,
# --
album => $release,
oldartist => $oldartist,
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/review
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/review 2008-03-10 17:34:38 UTC (rev 9756)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/review 2008-03-10 17:36:49 UTC (rev 9757)
@@ -896,7 +896,7 @@
$m->comp("/comp/linkartist", artist => $new_artist);
$m->out('</td>');
$m->out('<td class="autoedit">');
- $m->comp(".isAutoEdit", &ModDefs::MOD_MOVE_ALBUM);
+ $m->comp(".isAutoEdit", &ModDefs::MOD_MOVE_RELEASE);
$m->out('</td></tr>');
</%perl>
Modified: mb_server/branches/terminology/htdocs/edit/album/move.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/album/move.html 2008-03-10 17:34:38 UTC (rev 9756)
+++ mb_server/branches/terminology/htdocs/edit/album/move.html 2008-03-10 17:36:49 UTC (rev 9757)
@@ -181,7 +181,7 @@
DBH => $mb->{DBH},
uid => $session{uid},
privs => $session{privs},
- type => &ModDefs::MOD_MOVE_ALBUM,
+ type => &ModDefs::MOD_MOVE_RELEASE,
# --
album => $al,
oldartist => $oldar,
@@ -234,7 +234,7 @@
title => $title,
release => ($_isbatch ? undef : &$GetCachedRelease($releaseid[0])),
mp => ($_isbatch ? $mp : undef),
- mp_type => &ModDefs::MOD_MOVE_ALBUM,
+ mp_type => &ModDefs::MOD_MOVE_RELEASE,
);
</%perl>
More information about the MusicBrainz-commits
mailing list