[mb-commits] r11513 - in mb_server/branches/release-groups/cgi-bin/MusicBrainz/Server: . Moderation

[root at musicbrainz.org]

Author: luks
Date: 2009-05-16 16:12:31 +0000 (Sat, 16 May 2009)
New Revision: 11513

Modified:
   mb_server/branches/release-groups/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_GROUP_TYPE.pm
   mb_server/branches/release-groups/cgi-bin/MusicBrainz/Server/ReleaseGroup.pm
Log:
Fix handling of undef (no type) / 0 (NAT) in release group type.

Closes #5144


Modified: mb_server/branches/release-groups/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_GROUP_TYPE.pm
===================================================================
--- mb_server/branches/release-groups/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_GROUP_TYPE.pm	2009-05-16 16:02:42 UTC (rev 11512)
+++ mb_server/branches/release-groups/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_RELEASE_GROUP_TYPE.pm	2009-05-16 16:12:31 UTC (rev 11513)
@@ -41,8 +41,8 @@
 	my $newtype = $opts{'newtype'};
 
 	$self->SetArtist($release_group->GetArtist);
-	$self->SetPrev($release_group->GetType);
-	$self->SetNew($newtype);
+	$self->SetPrev(defined($release_group->GetType) ? $release_group->GetType : '');
+	$self->SetNew(defined($newtype) ? $newtype : '');
 	$self->SetTable("release_group");
 	$self->SetColumn("type");
 	$self->SetRowId($release_group->GetId);
@@ -77,6 +77,7 @@
 	}
 
 	# Check that its name has not changed
+	my $type = $self->GetPrev eq '' ? undef : $self->GetPrev; 
 	if ($release_group->GetType ne $self->GetPrev)
 	{
 		$self->InsertNote(MODBOT_MODERATOR, "This release group has already been changes");
@@ -97,7 +98,8 @@
 	return $status if $status;
 
 	my $release_group = $this->{_release_group};
-	$release_group->SetType($this->GetNew);
+	my $type = $this->GetNew eq '' ? undef : $this->GetNew; 
+	$release_group->SetType($type);
 	$release_group->UpdateType;
 
 	STATUS_APPLIED;

Modified: mb_server/branches/release-groups/cgi-bin/MusicBrainz/Server/ReleaseGroup.pm
===================================================================
--- mb_server/branches/release-groups/cgi-bin/MusicBrainz/Server/ReleaseGroup.pm	2009-05-16 16:02:42 UTC (rev 11512)
+++ mb_server/branches/release-groups/cgi-bin/MusicBrainz/Server/ReleaseGroup.pm	2009-05-16 16:12:31 UTC (rev 11513)
@@ -292,7 +292,7 @@
 	my $sql = Sql->new($this->{DBH});
 	$sql->Do(
 		"UPDATE release_group SET type = ? WHERE id = ?",
-		$this->GetType || undef,
+		$this->GetType,
 		$this->GetId,
 	);
 }