[mb-commits] r9751 - in mb_server/branches/terminology: cgi-bin cgi-bin/MusicBrainz/Server/Moderation htdocs/comp/moderation htdocs/edit/albumbatch
root at musicbrainz.org
root at musicbrainz.org
Mon Mar 10 16:18:42 UTC 2008
Author: luks
Date: 2008-03-10 16:18:42 +0000 (Mon, 10 Mar 2008)
New Revision: 9751
Added:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_RELEASE.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_RELEASE_MAC.pm
mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_RELEASE
mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_RELEASE_MAC
Removed:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_ALBUM.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_ALBUM_MAC.pm
mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_ALBUM
mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_ALBUM_MAC
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_ADD_RELEASEEVENTS.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASEEVENTS.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASEEVENTS.pm
mb_server/branches/terminology/htdocs/edit/albumbatch/merge.html
Log:
s/MOD_MERGE_ALBUM/MOD_MERGE_RELEASE/ (changes both MOD_MERGE_ALBUM and MOD_MERGE_ALBUM_MAC)
Modified: mb_server/branches/terminology/cgi-bin/ModDefs.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/ModDefs.pm 2008-03-10 16:15:55 UTC (rev 9750)
+++ mb_server/branches/terminology/cgi-bin/ModDefs.pm 2008-03-10 16:18:42 UTC (rev 9751)
@@ -95,9 +95,9 @@
use constant MOD_REMOVE_DISCID => 20;
use constant MOD_MOVE_DISCID => 21;
use constant MOD_REMOVE_TRMID => 22;
-use constant MOD_MERGE_ALBUM => 23;
+use constant MOD_MERGE_RELEASE => 23;
use constant MOD_REMOVE_RELEASES => 24;
-use constant MOD_MERGE_ALBUM_MAC => 25;
+use constant MOD_MERGE_RELEASE_MAC => 25;
use constant MOD_EDIT_ALBUMATTRS => 26;
use constant MOD_ADD_TRMS => 27;
use constant MOD_EDIT_ARTISTALIAS => 28;
@@ -311,8 +311,8 @@
MOD_EDIT_TRACKTIME . "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit if no times where set"},
MOD_EDIT_URL . "" => {'category' => CAT_DEPENDS, 'criteria' => ""},
MOD_MAC_TO_SAC . "" => {'category' => CAT_DEPENDS, 'criteria' => "Highest level of release or new artist"},
- MOD_MERGE_ALBUM . "" => {'category' => CAT_DEPENDS, 'criteria' => "Highest level of release or new artist"},
- MOD_MERGE_ALBUM_MAC . "" => {'category' => CAT_DEPENDS, 'criteria' => "Highest level of release or new artist"},
+ MOD_MERGE_RELEASE . "" => {'category' => CAT_DEPENDS, 'criteria' => "Highest level of release or new artist"},
+ 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"},
Modified: mb_server/branches/terminology/cgi-bin/Moderation.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-10 16:15:55 UTC (rev 9750)
+++ mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-10 16:18:42 UTC (rev 9751)
@@ -76,8 +76,8 @@
require MusicBrainz::Server::Moderation::MOD_EDIT_TRACKTIME;
require MusicBrainz::Server::Moderation::MOD_EDIT_URL;
require MusicBrainz::Server::Moderation::MOD_MAC_TO_SAC;
-require MusicBrainz::Server::Moderation::MOD_MERGE_ALBUM;
-require MusicBrainz::Server::Moderation::MOD_MERGE_ALBUM_MAC;
+require MusicBrainz::Server::Moderation::MOD_MERGE_RELEASE;
+require MusicBrainz::Server::Moderation::MOD_MERGE_RELEASE_MAC;
require MusicBrainz::Server::Moderation::MOD_MERGE_ARTIST;
require MusicBrainz::Server::Moderation::MOD_MERGE_LABEL;
# require MusicBrainz::Server::Moderation::MOD_MERGE_LINK_TYPE; -- not implemented
@@ -148,12 +148,12 @@
name => &MusicBrainz::Server::Moderation::MOD_MOVE_DISCID::Name() },
MOD_REMOVE_TRMID ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_TRMID::Name() },
- MOD_MERGE_ALBUM ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_MERGE_ALBUM::Name() },
+ MOD_MERGE_RELEASE ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_MERGE_RELEASE::Name() },
MOD_REMOVE_RELEASES ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASES::Name() },
- MOD_MERGE_ALBUM_MAC ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_MERGE_ALBUM_MAC::Name() },
+ MOD_MERGE_RELEASE_MAC ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_MERGE_RELEASE_MAC::Name() },
MOD_EDIT_ALBUMATTRS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMATTRS::Name() },
MOD_ADD_TRMS ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -272,12 +272,12 @@
name => &MusicBrainz::Server::Moderation::MOD_MOVE_DISCID::Name() },
MOD_REMOVE_TRMID ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_TRMID::Name() },
- MOD_MERGE_ALBUM ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_MERGE_ALBUM::Name() },
+ MOD_MERGE_RELEASE ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_MERGE_RELEASE::Name() },
MOD_REMOVE_RELEASES ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASES::Name() },
- MOD_MERGE_ALBUM_MAC ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_MERGE_ALBUM_MAC::Name() },
+ MOD_MERGE_RELEASE_MAC ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_MERGE_RELEASE_MAC::Name() },
MOD_EDIT_ALBUMATTRS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMATTRS::Name() },
MOD_ADD_TRMS ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -396,12 +396,12 @@
name => &MusicBrainz::Server::Moderation::MOD_MOVE_DISCID::Name() },
MOD_REMOVE_TRMID ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_TRMID::Name() },
- MOD_MERGE_ALBUM ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_MERGE_ALBUM::Name() },
+ MOD_MERGE_RELEASE ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_MERGE_RELEASE::Name() },
MOD_REMOVE_RELEASES ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASES::Name() },
- MOD_MERGE_ALBUM_MAC ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_MERGE_ALBUM_MAC::Name() },
+ MOD_MERGE_RELEASE_MAC ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_MERGE_RELEASE_MAC::Name() },
MOD_EDIT_ALBUMATTRS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMATTRS::Name() },
MOD_ADD_TRMS ."" => { duration => 0, votes => 0, expireaction => EXPIRE_REJECT, autoedit => 0,
@@ -1759,8 +1759,8 @@
# do not display release if we have a batch edit type
$this->{"albumid"} = undef
if ($this->GetType == &ModDefs::MOD_REMOVE_RELEASES or
- $this->GetType == &ModDefs::MOD_MERGE_ALBUM or
- $this->GetType == &ModDefs::MOD_MERGE_ALBUM_MAC or
+ $this->GetType == &ModDefs::MOD_MERGE_RELEASE or
+ $this->GetType == &ModDefs::MOD_MERGE_RELEASE_MAC or
$this->GetType == &ModDefs::MOD_EDIT_ALBUM_LANGUAGE or
$this->GetType == &ModDefs::MOD_EDIT_ALBUMATTRS);
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_RELEASEEVENTS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_RELEASEEVENTS.pm 2008-03-10 16:15:55 UTC (rev 9750)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_RELEASEEVENTS.pm 2008-03-10 16:18:42 UTC (rev 9751)
@@ -20,7 +20,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
-# $Id: MOD_MERGE_ALBUM_MAC.pm 7397 2006-05-01 12:56:48Z keschte $
+# $Id: MOD_MERGE_RELEASE_MAC.pm 7397 2006-05-01 12:56:48Z keschte $
#____________________________________________________________________________
use strict;
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASEEVENTS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASEEVENTS.pm 2008-03-10 16:15:55 UTC (rev 9750)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASEEVENTS.pm 2008-03-10 16:18:42 UTC (rev 9751)
@@ -20,7 +20,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
-# $Id: MOD_MERGE_ALBUM_MAC.pm 7397 2006-05-01 12:56:48Z keschte $
+# $Id: MOD_MERGE_RELEASE_MAC.pm 7397 2006-05-01 12:56:48Z keschte $
#____________________________________________________________________________
use strict;
Deleted: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_ALBUM.pm
Deleted: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_ALBUM_MAC.pm
Copied: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_RELEASE.pm (from rev 9746, mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_ALBUM.pm)
Copied: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_RELEASE_MAC.pm (from rev 9732, mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_MERGE_ALBUM_MAC.pm)
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASEEVENTS.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASEEVENTS.pm 2008-03-10 16:15:55 UTC (rev 9750)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASEEVENTS.pm 2008-03-10 16:18:42 UTC (rev 9751)
@@ -20,7 +20,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
-# $Id: MOD_MERGE_ALBUM_MAC.pm 7397 2006-05-01 12:56:48Z keschte $
+# $Id: MOD_MERGE_RELEASE_MAC.pm 7397 2006-05-01 12:56:48Z keschte $
#____________________________________________________________________________
use strict;
Deleted: mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_ALBUM
Deleted: mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_ALBUM_MAC
Copied: mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_RELEASE (from rev 9732, mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_ALBUM)
Copied: mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_RELEASE_MAC (from rev 9732, mb_server/branches/terminology/htdocs/comp/moderation/MOD_MERGE_ALBUM_MAC)
Modified: mb_server/branches/terminology/htdocs/edit/albumbatch/merge.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/albumbatch/merge.html 2008-03-10 16:15:55 UTC (rev 9750)
+++ mb_server/branches/terminology/htdocs/edit/albumbatch/merge.html 2008-03-10 16:18:42 UTC (rev 9751)
@@ -114,8 +114,8 @@
privs => $session{privs},
type => (
$mac
- ? &ModDefs::MOD_MERGE_ALBUM_MAC
- : &ModDefs::MOD_MERGE_ALBUM
+ ? &ModDefs::MOD_MERGE_RELEASE_MAC
+ : &ModDefs::MOD_MERGE_RELEASE
),
# --
albums => \@objs,
More information about the MusicBrainz-commits
mailing list