[mb-commits] r9753 - in mb_server/branches/terminology: cgi-bin cgi-bin/MusicBrainz/Server/Moderation htdocs/comp/form htdocs/comp/layout htdocs/comp/moderation htdocs/comp/release_editor htdocs/edit/album
root at musicbrainz.org
root at musicbrainz.org
Mon Mar 10 16:24:30 UTC 2008
Author: luks
Date: 2008-03-10 16:24:30 +0000 (Mon, 10 Mar 2008)
New Revision: 9753
Added:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_ATTRS.pm
mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_RELEASE_ATTRS
Removed:
mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUMATTRS.pm
mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_ALBUMATTRS
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_EDIT_RELEASE_LANGUAGE.pm
mb_server/branches/terminology/htdocs/comp/form/currentvalue
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/attrform
mb_server/branches/terminology/htdocs/edit/album/editattributes.html
Log:
s/MOD_EDIT_ALBUMATTRS/MOD_EDIT_RELEASE_ATTRS/
Modified: mb_server/branches/terminology/cgi-bin/ModDefs.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/ModDefs.pm 2008-03-10 16:21:27 UTC (rev 9752)
+++ mb_server/branches/terminology/cgi-bin/ModDefs.pm 2008-03-10 16:24:30 UTC (rev 9753)
@@ -98,7 +98,7 @@
use constant MOD_MERGE_RELEASE => 23;
use constant MOD_REMOVE_RELEASES => 24;
use constant MOD_MERGE_RELEASE_MAC => 25;
-use constant MOD_EDIT_ALBUMATTRS => 26;
+use constant MOD_EDIT_RELEASE_ATTRS => 26;
use constant MOD_ADD_TRMS => 27;
use constant MOD_EDIT_ARTISTALIAS => 28;
use constant MOD_EDIT_RELEASE_EVENTS_OLD => 29;
@@ -293,7 +293,7 @@
MOD_CHANGE_TRACK_ARTIST . "" => {'category' => CAT_DEPENDS, 'criteria' => "Highest level of release, current artist or new artist"},
MOD_CHANGE_WIKIDOC . "" => {'category' => CAT_NONE, 'criteria' => ""},
MOD_EDIT_RELEASE_LANGUAGE . "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit if no language was set"},
- MOD_EDIT_ALBUMATTRS . "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit if no attributes where set"},
+ MOD_EDIT_RELEASE_ATTRS . "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit if no attributes where set"},
MOD_EDIT_ALBUMNAME . "" => {'category' => CAT_RELEASE, 'criteria' => "Auto-edit when changing capitalisation or accents"},
MOD_EDIT_ARTIST . "" => {'category' => CAT_ARTIST, 'criteria' => "Auto-edit when providing new properties (Begin Date, End Date or Type) or changing capitalisation or accents"},
MOD_EDIT_ARTISTALIAS . "" => {'category' => CAT_ARTIST, 'criteria' => "Auto-edit when changing capitalisation or accents"},
Modified: mb_server/branches/terminology/cgi-bin/Moderation.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-10 16:21:27 UTC (rev 9752)
+++ mb_server/branches/terminology/cgi-bin/Moderation.pm 2008-03-10 16:24:30 UTC (rev 9753)
@@ -58,7 +58,7 @@
require MusicBrainz::Server::Moderation::MOD_CHANGE_TRACK_ARTIST;
require MusicBrainz::Server::Moderation::MOD_CHANGE_WIKIDOC;
require MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_LANGUAGE;
-require MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMATTRS;
+require MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_ATTRS;
require MusicBrainz::Server::Moderation::MOD_EDIT_ALBUMNAME;
require MusicBrainz::Server::Moderation::MOD_EDIT_ARTIST;
require MusicBrainz::Server::Moderation::MOD_EDIT_ARTISTALIAS;
@@ -154,8 +154,8 @@
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASES::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_EDIT_RELEASE_ATTRS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_ATTRS::Name() },
MOD_ADD_TRMS ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_TRMS::Name() },
MOD_EDIT_ARTISTALIAS ."" => { duration => 4, votes => 1, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -278,8 +278,8 @@
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASES::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_EDIT_RELEASE_ATTRS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_ATTRS::Name() },
MOD_ADD_TRMS ."" => { duration => 0, votes => 0, expireaction => EXPIRE_ACCEPT, autoedit => 1,
name => &MusicBrainz::Server::Moderation::MOD_ADD_TRMS::Name() },
MOD_EDIT_ARTISTALIAS ."" => { duration => 14, votes => 3, expireaction => EXPIRE_ACCEPT, autoedit => 1,
@@ -402,8 +402,8 @@
name => &MusicBrainz::Server::Moderation::MOD_REMOVE_RELEASES::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_EDIT_RELEASE_ATTRS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
+ name => &MusicBrainz::Server::Moderation::MOD_EDIT_RELEASE_ATTRS::Name() },
MOD_ADD_TRMS ."" => { duration => 0, votes => 0, expireaction => EXPIRE_REJECT, autoedit => 0,
name => &MusicBrainz::Server::Moderation::MOD_ADD_TRMS::Name() },
MOD_EDIT_ARTISTALIAS ."" => { duration => 14, votes => 4, expireaction => EXPIRE_REJECT, autoedit => 0,
@@ -1762,7 +1762,7 @@
$this->GetType == &ModDefs::MOD_MERGE_RELEASE or
$this->GetType == &ModDefs::MOD_MERGE_RELEASE_MAC or
$this->GetType == &ModDefs::MOD_EDIT_RELEASE_LANGUAGE or
- $this->GetType == &ModDefs::MOD_EDIT_ALBUMATTRS);
+ $this->GetType == &ModDefs::MOD_EDIT_RELEASE_ATTRS);
$mason->out(qq!<table class="edittype">!);
Deleted: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUMATTRS.pm
Copied: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_ATTRS.pm (from rev 9732, mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_ALBUMATTRS.pm)
Modified: mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_LANGUAGE.pm
===================================================================
--- mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_LANGUAGE.pm 2008-03-10 16:21:27 UTC (rev 9752)
+++ mb_server/branches/terminology/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_LANGUAGE.pm 2008-03-10 16:24:30 UTC (rev 9753)
@@ -104,7 +104,7 @@
return $new->{can_automod};
}
-# Used for display purposes by /comp/moderation/MOD_EDIT_ALBUMATTRS
+# Used for display purposes by /comp/moderation/MOD_EDIT_RELEASE_ATTRS
sub PostLoad
{
my $self = shift;
Modified: mb_server/branches/terminology/htdocs/comp/form/currentvalue
===================================================================
--- mb_server/branches/terminology/htdocs/comp/form/currentvalue 2008-03-10 16:21:27 UTC (rev 9752)
+++ mb_server/branches/terminology/htdocs/comp/form/currentvalue 2008-03-10 16:24:30 UTC (rev 9753)
@@ -108,7 +108,7 @@
$mp = $release->GetLanguageModPending;
last SWITCH;
}
- if ($mp_type == &ModDefs::MOD_EDIT_ALBUMATTRS)
+ if ($mp_type == &ModDefs::MOD_EDIT_RELEASE_ATTRS)
{
$mp = $release->GetAttributeModPending;
last SWITCH;
Modified: mb_server/branches/terminology/htdocs/comp/layout/editformbegin
===================================================================
--- mb_server/branches/terminology/htdocs/comp/layout/editformbegin 2008-03-10 16:21:27 UTC (rev 9752)
+++ mb_server/branches/terminology/htdocs/comp/layout/editformbegin 2008-03-10 16:24:30 UTC (rev 9753)
@@ -41,7 +41,7 @@
$type => undef # artist or release
$id => undef # rowid
$mp => undef # optional moderation type argument
- $mp_type => "" # optional moderation type argument (e.g. MOD_EDIT_ALBUMATTRS|MOD_EDIT_RELEASE_LANGUAGE...)
+ $mp_type => "" # optional moderation type argument (e.g. MOD_EDIT_RELEASE_ATTRS|MOD_EDIT_RELEASE_LANGUAGE...)
$show_coc => 1
@@ -91,10 +91,10 @@
}
# release attributes
- elsif ($mp_type == &ModDefs::MOD_EDIT_ALBUMATTRS)
+ elsif ($mp_type == &ModDefs::MOD_EDIT_RELEASE_ATTRS)
{
$mp = $release->GetAttributeModPending;
- $mp_typefilter = "&mod_type=".&ModDefs::MOD_EDIT_ALBUMATTRS;
+ $mp_typefilter = "&mod_type=".&ModDefs::MOD_EDIT_RELEASE_ATTRS;
}
# everything else
@@ -216,7 +216,7 @@
}
# edit release attributes
- elsif ($mp_type == &ModDefs::MOD_EDIT_ALBUMATTRS)
+ elsif ($mp_type == &ModDefs::MOD_EDIT_RELEASE_ATTRS)
{
$mp_type_message = $m->scomp("/comp/linkdoc", "EditReleaseAttributesEdit", "Edit Release Attribute edits");
}
Deleted: mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_ALBUMATTRS
Copied: mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_RELEASE_ATTRS (from rev 9732, mb_server/branches/terminology/htdocs/comp/moderation/MOD_EDIT_ALBUMATTRS)
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit 2008-03-10 16:21:27 UTC (rev 9752)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/entermoderations-edit 2008-03-10 16:24:30 UTC (rev 9753)
@@ -143,7 +143,7 @@
);
}
- # MOD_EDIT_ALBUMATTRS
+ # MOD_EDIT_RELEASE_ATTRS
# Enter an edit if the album attributes were changed
$ov = $orig{"attr_type"}.",".$orig{"attr_status"};
$nv = $ARGS{"attr_type"}.",".$ARGS{"attr_status"};
@@ -153,7 +153,7 @@
DBH => $mb->{DBH},
uid => $session{uid},
privs => $session{privs},
- type => &ModDefs::MOD_EDIT_ALBUMATTRS,
+ type => &ModDefs::MOD_EDIT_RELEASE_ATTRS,
# --
albums => [ $release ],
attr_type => $ARGS{"attr_type"},
Modified: mb_server/branches/terminology/htdocs/comp/release_editor/review
===================================================================
--- mb_server/branches/terminology/htdocs/comp/release_editor/review 2008-03-10 16:21:27 UTC (rev 9752)
+++ mb_server/branches/terminology/htdocs/comp/release_editor/review 2008-03-10 16:24:30 UTC (rev 9753)
@@ -417,7 +417,7 @@
oldvalue => $attrvalues[0],
newvalue => $attrvalues[1],
- modtype => &ModDefs::MOD_EDIT_ALBUMATTRS,
+ modtype => &ModDefs::MOD_EDIT_RELEASE_ATTRS,
cnt => ++$releasechanges
);
}
Modified: mb_server/branches/terminology/htdocs/edit/album/attrform
===================================================================
--- mb_server/branches/terminology/htdocs/edit/album/attrform 2008-03-10 16:21:27 UTC (rev 9752)
+++ mb_server/branches/terminology/htdocs/edit/album/attrform 2008-03-10 16:24:30 UTC (rev 9753)
@@ -91,7 +91,7 @@
my ($type, $status) = $release->GetReleaseTypeAndStatus;
$m->out(qq!<td style="padding-right: 20px">!);
- $m->comp("/comp/form/currentvalue", release => $release, mp_type => &ModDefs::MOD_EDIT_ALBUMATTRS);
+ $m->comp("/comp/form/currentvalue", release => $release, mp_type => &ModDefs::MOD_EDIT_RELEASE_ATTRS);
my $artist = $m->comp("/comp/loadartist", $mb, $release->GetArtist);
$m->out(qq!</td><td style="padding-right: 20px">!);
Modified: mb_server/branches/terminology/htdocs/edit/album/editattributes.html
===================================================================
--- mb_server/branches/terminology/htdocs/edit/album/editattributes.html 2008-03-10 16:21:27 UTC (rev 9752)
+++ mb_server/branches/terminology/htdocs/edit/album/editattributes.html 2008-03-10 16:24:30 UTC (rev 9753)
@@ -86,7 +86,7 @@
DBH => $mb->{DBH},
uid => $session{uid},
privs => $session{privs},
- type => &ModDefs::MOD_EDIT_ALBUMATTRS,
+ type => &ModDefs::MOD_EDIT_RELEASE_ATTRS,
# --
albums => \@releaseobjs,
attr_type => $attr_type,
@@ -138,7 +138,7 @@
<& /comp/layout/editformbegin, title => "Edit release attributes",
release => $releaseobjs[0],
- mp_type => &ModDefs::MOD_EDIT_ALBUMATTRS,
+ mp_type => &ModDefs::MOD_EDIT_RELEASE_ATTRS,
&>
% }
@@ -146,7 +146,7 @@
% {
<& /comp/layout/editformbegin, title => "Edit release attributes",
- mp_type => &ModDefs::MOD_EDIT_ALBUMATTRS,
+ mp_type => &ModDefs::MOD_EDIT_RELEASE_ATTRS,
mp => $mp,
&>
% }
More information about the MusicBrainz-commits
mailing list