[mb-commits] r9792 - in mb_server/branches/ReleaseTrack/htdocs/comp: release release_editor

[root at musicbrainz.org]

Author: luks
Date: 2008-03-22 13:14:41 +0000 (Sat, 22 Mar 2008)
New Revision: 9792

Modified:
   mb_server/branches/ReleaseTrack/htdocs/comp/release/release_track
   mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/entermoderations-edit
   mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/init-editall
   mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/review
Log:
Use ReleaseTrack IDs in the release editor (fixes track number editing)

Modified: mb_server/branches/ReleaseTrack/htdocs/comp/release/release_track
===================================================================
--- mb_server/branches/ReleaseTrack/htdocs/comp/release/release_track	2008-03-21 17:00:22 UTC (rev 9791)
+++ mb_server/branches/ReleaseTrack/htdocs/comp/release/release_track	2008-03-22 13:14:41 UTC (rev 9792)
@@ -97,9 +97,12 @@
 	# if the track has a rowid, show track name as link, else text-only.
 	if (MusicBrainz::Server::Validation::IsNonNegInteger($track->GetId) && $track->GetId)
 	{
-		$m->out(sprintf qq!<a href="/track/%s.html" title="">%s</a>!,
-						$track->GetMBId,
-						encode_entities($track->GetName));
+		if ($track->GetMBId) {
+			$m->out(sprintf qq!<a href="/track/%s.html" title="">%s</a>!, $track->GetMBId, encode_entities($track->GetName));
+		}
+		else {
+			$m->out(sprintf qq!<a href="/show/track/?trackid=%s" title="">%s</a>!, $track->GetId, encode_entities($track->GetName));
+		}
 	}
 	else
 	{

Modified: mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/entermoderations-edit
===================================================================
--- mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/entermoderations-edit	2008-03-21 17:00:22 UTC (rev 9791)
+++ mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/entermoderations-edit	2008-03-22 13:14:41 UTC (rev 9792)
@@ -346,15 +346,14 @@
 				my $new_artistid = $ARGS{sprintf "tr%d_artistid", $t};
 
 				# prepare Track object
-				my $track;
+				my ($track, $rtrack);
 				if ($new_id) 
 				{
-					$track = MusicBrainz::Server::Track->new($mb->{DBH});
-					$track->SetId($new_id);
-					# FIXME-TRACKMERGING
-					#$track->SetRelease($releaseid);
-					$track->LoadFromId
+					$rtrack = MusicBrainz::Server::ReleaseTrack->new($mb->{DBH});
+					$rtrack->SetId($new_id);
+					$rtrack->LoadFromId(1)
 						or die "Error loading track\n";
+					$track = $rtrack->GetTrack;
 				}
 
 				# MOD_REMOVE_TRACK
@@ -383,7 +382,7 @@
 							privs => $session{privs},
 							type => &ModDefs::MOD_EDIT_TRACKNUM,
 							# --
-							track => $track,
+							release_track => $rtrack,
 							newseq => $new_seq,
 							# TODO depmod on $modid ?
 						);

Modified: mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/init-editall
===================================================================
--- mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/init-editall	2008-03-21 17:00:22 UTC (rev 9791)
+++ mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/init-editall	2008-03-22 13:14:41 UTC (rev 9792)
@@ -86,7 +86,7 @@
 	{
 		my $rtr = $tracks->[$i];
 		my $tr = $rtr->GetTrack;
-		$orig{"trackid$i"} = $tr->GetId;
+		$orig{"trackid$i"} = $rtr->GetId;
 		$orig{"trackseq$i"} = $rtr->GetSequence;
 		$orig{"track$i"} = $tr->GetName;
 		$orig{"tracklength$i"} = MusicBrainz::Server::Track::FormatTrackLength($tr->GetLength);

Modified: mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/review
===================================================================
--- mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/review	2008-03-21 17:00:22 UTC (rev 9791)
+++ mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/review	2008-03-22 13:14:41 UTC (rev 9792)
@@ -241,17 +241,19 @@
 		# only use the tracks which are not choosed to be deleted.
 		if (!$ARGS{"trackdel$i"})
 		{
-			# initialise track object
 			my $trackid = $ARGS{"trackid$i"};
-			my $tr = MusicBrainz::Server::Track->new($mb->{DBH});
-			$tr->SetId($trackid);
-			$tr->LoadFromId
+			my $release_track = MusicBrainz::Server::ReleaseTrack->new($mb->{DBH});
+			$release_track->SetId($trackid);
+			$release_track->LoadFromId
 				or return $m->comp("/comp/error",
 					"Track '$trackid' not found in the database.",
 					1, 1,
 				)
 				if ($trackid ne "");
 
+			# initialise track object
+			my $tr = MusicBrainz::Server::Track->new($mb->{DBH});
+			$tr->SetId($release_track->GetTrackId);
 			$tr->SetName($ARGS{"track$i"});
 			$tr->SetLength(MusicBrainz::Server::Track::UnformatTrackLength($ARGS{"tracklength$i"}));
 
@@ -272,7 +274,6 @@
 				$ARGS{getField($i, "artistname")} = $artistname;
 			}
 
-			my $release_track = MusicBrainz::Server::ReleaseTrack->new($mb->{DBH});
 			$release_track->SetSequence($ARGS{"trackseq$i"});
 			$release_track->SetTrack($tr);