[mb-commits] r9747 - in mb_server/branches/terminology: cgi-bin cgi-bin/MusicBrainz/Server cgi-bin/MusicBrainz/Server/Moderation htdocs/comp/moderation htdocs/edit/annotation/album htdocs/mod/search/pre
root at musicbrainz.org
root at musicbrainz.org
Mon Mar 10 16:03:28 UTC 2008
Author: luks
Date: 2008-03-10 16:03:28 +0000 (Mon, 10 Mar 2008)
New Revision: 9747
Added:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_RELEASE_ANNOTATION.pm
mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_RELEASE_ANNOTATION
Removed:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ALBUM_ANNOTATION.pm
mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_ALBUM_ANNOTATION
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/Annotation.pm
mb_server/branches/terminology/htdocs/edit/annotation/album/edit.html
mb_server/branches/terminology/htdocs/edit/annotation/album/history.html
mb_server/branches/terminology/htdocs/mod/search/pre/annotations.html
Log:
s/MOD_ADD_ALBUM_ANNOTATION/MOD_ADD_RELEASE_ANNOTATION/
Modified: mb_server/branches/terminology/cgi-bin/ModDefs.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/ModDefs.pm 2008-03-09 21:23:28 UTC (rev 9746)
+++ mb_server/branches/terminology/cgi-bin/ModDefs.pm 2008-03-10 16:03:28 UTC (rev 9747)
@@ -103,7 +103,7 @@
use constant MOD_EDIT_ARTISTALIAS => 28;
use constant MOD_EDIT_RELEASES => 29;
use constant MOD_ADD_ARTIST_ANNOTATION => 30;
-use constant MOD_ADD_ALBUM_ANNOTATION => 31;
+use constant MOD_ADD_RELEASE_ANNOTATION => 31;
use constant MOD_ADD_DISCID => 32;
use constant MOD_ADD_LINK => 33;
use constant MOD_EDIT_LINK => 34;
@@ -271,7 +271,7 @@
# DataQuality level moderations catogorization
my %ModCategories = (
MOD_ADD_ALBUM . "" => {'category' => CAT_ARTIST, 'criteria' => ""},
- MOD_ADD_ALBUM_ANNOTATION . "" => {'category' => CAT_NONE, 'criteria' => ""},
+ MOD_ADD_RELEASE_ANNOTATION . "" => {'category' => CAT_NONE, 'criteria' => ""},
MOD_ADD_ARTIST . "" => {'category' => CAT_NONE, 'criteria' => ""},
MOD_ADD_ARTISTALIAS . "" => {'category' => CAT_ARTIST, 'criteria' => ""},
MOD_ADD_ARTIST_ANNOTATION . "" => {'category' => CAT_NONE, 'criteria' => ""},
Modified: mb_server/branches/terminology/cgi-bin/Moderation.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-09 21:23:28 UTC (rev 9746)
+++ mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-10 16:03:28 UTC (rev 9747)
@@ -36,7 +36,7 @@
# Load all the moderation handlers (sorted please)
require MusicBrainz::Server::Moderation::MOD_ADD_ALBUM;
-require MusicBrainz::Server::Moderation::MOD_ADD_ALBUM_ANNOTATION;
+require MusicBrainz::Server::Moderation::MOD_ADD_RELEASE_ANNOTATION;
require MusicBrainz::Server::Moderation::MOD_ADD_ARTIST;
require MusicBrainz::Server::Moderation::MOD_ADD_ARTISTALIAS;
require MusicBrainz::Server::Moderation::MOD_ADD_ARTIST_ANNOTATION;
@@ -164,8 +164,8 @@
name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASES::Name() },
MOD_ADD_ARTIST_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_ARTIST_ANNOTATION::Name() },
- MOD_ADD_ALBUM_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_ADD_ALBUM_ANNOTATION::Name() },
+ MOD_ADD_RELEASE_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_ADD_RELEASE_ANNOTATION::Name() },
MOD_ADD_TRACK_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_TRACK_ANNOTATION::Name() },
MOD_ADD_DISCID ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -288,8 +288,8 @@
name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASES::Name() },
MOD_ADD_ARTIST_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_ARTIST_ANNOTATION::Name() },
- MOD_ADD_ALBUM_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_ADD_ALBUM_ANNOTATION::Name() },
+ MOD_ADD_RELEASE_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_ADD_RELEASE_ANNOTATION::Name() },
MOD_ADD_TRACK_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_TRACK_ANNOTATION::Name() },
MOD_ADD_DISCID ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -412,8 +412,8 @@
name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASES::Name() },
MOD_ADD_ARTIST_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_REJECT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_ARTIST_ANNOTATION::Name() },
- MOD_ADD_ALBUM_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_REJECT, autoedit => 1,
- name => &MusicBrainz::Server::Moderation::MOD_ADD_ALBUM_ANNOTATION::Name() },
+ MOD_ADD_RELEASE_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_REJECT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_ADD_RELEASE_ANNOTATION::Name() },
MOD_ADD_TRACK_ANNOTATION ."" => { duration => 0, votes => 0, expireaction => EXPIRE_REJECT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_TRACK_ANNOTATION::Name() },
MOD_ADD_DISCID ."" => { duration => 0, votes => 0, expireaction => EXPIRE_REJECT, autoedit => 0,
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Annotation.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Annotation.pm 2008-03-09 21:23:28 UTC (rev 9746)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Annotation.pm 2008-03-10 16:03:28 UTC (rev 9747)
@@ -592,7 +592,7 @@
DBH => $self->{DBH},
uid => MODBOT_MODERATOR,
privs => UserStuff->AUTOMOD_FLAG,
- type => &ModDefs::MOD_ADD_ALBUM_ANNOTATION,
+ type => &ModDefs::MOD_ADD_RELEASE_ANNOTATION,
# --
artistid => $artist_id,
albumid => $new_id,
Deleted: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ALBUM_ANNOTATION.pm
Copied: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_RELEASE_ANNOTATION.pm (from rev 9746, mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_ADD_ALBUM_ANNOTATION.pm)
Deleted: mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_ALBUM_ANNOTATION
Copied: mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_RELEASE_ANNOTATION (from rev 9732, mb_server/branches/terminology/htdocs/comp/moderation/MOD_ADD_ALBUM_ANNOTATION)
Modified: mb_server/branches/terminology/htdocs/edit/annotation/album/edit.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/annotation/album/edit.html 2008-03-09 21:23:28 UTC (rev 9746)
+++ mb_server/branches/terminology/htdocs/edit/annotation/album/edit.html 2008-03-10 16:03:28 UTC (rev 9747)
@@ -4,7 +4,7 @@
<%attr>
annotationtype => &MusicBrainz::Server::Annotation::RELEASE_ANNOTATION
- edittype => &ModDefs::MOD_ADD_ALBUM_ANNOTATION
+ edittype => &ModDefs::MOD_ADD_RELEASE_ANNOTATION
entitytype => "album"
title => "Edit Release Annotation"
useartistid => 1
Modified: mb_server/branches/terminology/htdocs/edit/annotation/album/history.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/annotation/album/history.html 2008-03-09 21:23:28 UTC (rev 9746)
+++ mb_server/branches/terminology/htdocs/edit/annotation/album/history.html 2008-03-10 16:03:28 UTC (rev 9747)
@@ -4,7 +4,7 @@
<%attr>
annotationtype => &MusicBrainz::Server::Annotation::RELEASE_ANNOTATION
- edittype => &ModDefs::MOD_ADD_ALBUM_ANNOTATION
+ edittype => &ModDefs::MOD_ADD_RELEASE_ANNOTATION
entitytype => "album"
title => "Release Annotation History"
useartistid => 1
Modified: mb_server/branches/terminology/htdocs/mod/search/pre/annotations.html
===================================================================
--- mb_server/branches/terminology/htdocs/mod/search/pre/annotations.html 2008-03-09 21:23:28 UTC (rev 9746)
+++ mb_server/branches/terminology/htdocs/mod/search/pre/annotations.html 2008-03-10 16:03:28 UTC (rev 9747)
@@ -37,7 +37,7 @@
my %filter = (
mod_type => [
&ModDefs::MOD_ADD_ARTIST_ANNOTATION,
- &ModDefs::MOD_ADD_ALBUM_ANNOTATION,
+ &ModDefs::MOD_ADD_RELEASE_ANNOTATION,
],
moderator_type => 5, # not me
orderby => "desc",
More information about the MusicBrainz-commits
mailing list