[mb-commits] r9750 - in mb_server/branches/terminology: cgi-bin cgi-bin/MusicBrainz/Server/Moderation htdocs/comp/moderation htdocs/edit/album htdocs/edit/albumbatch
root at musicbrainz.org
root at musicbrainz.org
Mon Mar 10 16:15:55 UTC 2008
Author: luks
Date: 2008-03-10 16:15:55 +0000 (Mon, 10 Mar 2008)
New Revision: 9750
Added:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASE.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASES.pm
mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_RELEASE
mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_RELEASES
Removed:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ALBUM.pm
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ALBUMS.pm
mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_ALBUM
mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_ALBUMS
Modified:
mb_server/branches/terminology/cgi-bin/ModDefs.pm
mb_server/branches/terminology/cgi-bin/Moderation.pm
mb_server/branches/terminology/htdocs/edit/album/remove.html
mb_server/branches/terminology/htdocs/edit/albumbatch/remove.html
Log:
s/MOD_REMOVE_ALBUM/MOD_REMOVE_RELEASE/ (changes both MOD_REMOVE_ALBUM and MOD_REMOVE_ALBUMS)
Modified: mb_server/branches/terminology/cgi-bin/ModDefs.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/ModDefs.pm 2008-03-10 16:13:03 UTC (rev 9749)
+++ mb_server/branches/terminology/cgi-bin/ModDefs.pm 2008-03-10 16:15:55 UTC (rev 9750)
@@ -84,7 +84,7 @@
use constant MOD_SAC_TO_MAC => 9;
use constant MOD_CHANGE_TRACK_ARTIST => 10;
use constant MOD_REMOVE_TRACK => 11;
-use constant MOD_REMOVE_ALBUM => 12;
+use constant MOD_REMOVE_RELEASE => 12;
use constant MOD_MAC_TO_SAC => 13;
use constant MOD_REMOVE_ARTISTALIAS => 14;
use constant MOD_ADD_ARTISTALIAS => 15;
@@ -96,7 +96,7 @@
use constant MOD_MOVE_DISCID => 21;
use constant MOD_REMOVE_TRMID => 22;
use constant MOD_MERGE_ALBUM => 23;
-use constant MOD_REMOVE_ALBUMS => 24;
+use constant MOD_REMOVE_RELEASES => 24;
use constant MOD_MERGE_ALBUM_MAC => 25;
use constant MOD_EDIT_ALBUMATTRS => 26;
use constant MOD_ADD_TRMS => 27;
@@ -317,8 +317,8 @@
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_DISCID . "" => {'category' => CAT_RELEASE, 'criteria' => "Level of release with highest level"},
- MOD_REMOVE_ALBUM . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
- MOD_REMOVE_ALBUMS . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
+ MOD_REMOVE_RELEASE . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
+ MOD_REMOVE_RELEASES . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
MOD_REMOVE_ARTIST . "" => {'category' => CAT_ARTIST, 'criteria' => ""},
MOD_REMOVE_ARTISTALIAS . "" => {'category' => CAT_ARTIST, 'criteria' => ""},
MOD_REMOVE_DISCID . "" => {'category' => CAT_RELEASE, 'criteria' => ""},
Modified: mb_server/branches/terminology/cgi-bin/Moderation.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-10 16:13:03 UTC (rev 9749)
+++ mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-10 16:15:55 UTC (rev 9750)
@@ -83,8 +83,8 @@
# require MusicBrainz::Server::Moderation::MOD_MERGE_LINK_TYPE; -- not implemented
require MusicBrainz::Server::Moderation::MOD_MOVE_ALBUM;
require MusicBrainz::Server::Moderation::MOD_MOVE_DISCID;
-require MusicBrainz::Server::Moderation::MOD_REMOVE_ALBUM;
-require MusicBrainz::Server::Moderation::MOD_REMOVE_ALBUMS;
+require MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASE;
+require MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASES;
require MusicBrainz::Server::Moderation::MOD_REMOVE_ARTIST;
require MusicBrainz::Server::Moderation::MOD_REMOVE_ARTISTALIAS;
require MusicBrainz::Server::Moderation::MOD_REMOVE_DISCID;
@@ -126,8 +126,8 @@
name => &MusicBrainz::Server::Moderation::MOD_CHANGE_TRACK_ARTIST::Name() },
MOD_REMOVE_TRACK ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_TRACK::Name() },
- MOD_REMOVE_ALBUM ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_REMOVE_ALBUM::Name() },
+ MOD_REMOVE_RELEASE ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASE::Name() },
MOD_MAC_TO_SAC ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_MAC_TO_SAC::Name() },
MOD_REMOVE_ARTISTALIAS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -150,8 +150,8 @@
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_REMOVE_ALBUMS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_REMOVE_ALBUMS::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_EDIT_ALBUMATTRS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -250,8 +250,8 @@
name => &MusicBrainz::Server::Moderation::MOD_CHANGE_TRACK_ARTIST::Name() },
MOD_REMOVE_TRACK ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_TRACK::Name() },
- MOD_REMOVE_ALBUM ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_REMOVE_ALBUM::Name() },
+ MOD_REMOVE_RELEASE ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASE::Name() },
MOD_MAC_TO_SAC ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_MAC_TO_SAC::Name() },
MOD_REMOVE_ARTISTALIAS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
@@ -274,8 +274,8 @@
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_REMOVE_ALBUMS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_REMOVE_ALBUMS::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_EDIT_ALBUMATTRS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -374,8 +374,8 @@
name => &MusicBrainz::Server::Moderation::MOD_CHANGE_TRACK_ARTIST::Name() },
MOD_REMOVE_TRACK ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_TRACK::Name() },
- MOD_REMOVE_ALBUM ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_REMOVE_ALBUM::Name() },
+ MOD_REMOVE_RELEASE ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASE::Name() },
MOD_MAC_TO_SAC ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_MAC_TO_SAC::Name() },
MOD_REMOVE_ARTISTALIAS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
@@ -398,8 +398,8 @@
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_REMOVE_ALBUMS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
- name => &MusicBrainz::Server::Moderation::MOD_REMOVE_ALBUMS::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_EDIT_ALBUMATTRS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
@@ -1758,7 +1758,7 @@
# do not display release if we have a batch edit type
$this->{"albumid"} = undef
- if ($this->GetType == &ModDefs::MOD_REMOVE_ALBUMS or
+ 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_EDIT_ALBUM_LANGUAGE or
Deleted: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ALBUM.pm
Deleted: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ALBUMS.pm
Copied: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASE.pm (from rev 9732, mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ALBUM.pm)
Copied: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_RELEASES.pm (from rev 9732, mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_REMOVE_ALBUMS.pm)
Deleted: mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_ALBUM
Deleted: mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_ALBUMS
Copied: mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_RELEASE (from rev 9732, mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_ALBUM)
Copied: mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_RELEASES (from rev 9732, mb_server/branches/terminology/htdocs/comp/moderation/MOD_REMOVE_ALBUMS)
Modified: mb_server/branches/terminology/htdocs/edit/album/remove.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/album/remove.html 2008-03-10 16:13:03 UTC (rev 9749)
+++ mb_server/branches/terminology/htdocs/edit/album/remove.html 2008-03-10 16:15:55 UTC (rev 9750)
@@ -77,7 +77,7 @@
DBH => $mb->{DBH},
uid => $session{uid},
privs => $session{privs},
- type => &ModDefs::MOD_REMOVE_ALBUM,
+ type => &ModDefs::MOD_REMOVE_RELEASE,
# --
album => $release,
);
Modified: mb_server/branches/terminology/htdocs/edit/albumbatch/remove.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/albumbatch/remove.html 2008-03-10 16:13:03 UTC (rev 9749)
+++ mb_server/branches/terminology/htdocs/edit/albumbatch/remove.html 2008-03-10 16:15:55 UTC (rev 9750)
@@ -112,7 +112,7 @@
DBH => $mb->{DBH},
uid => $session{uid},
privs => $session{privs},
- type => &ModDefs::MOD_REMOVE_ALBUMS,
+ type => &ModDefs::MOD_REMOVE_RELEASES,
# --
albums => \@objs,
);
More information about the MusicBrainz-commits
mailing list