[mb-commits] r9788 - mb_server/branches/ReleaseTrack/htdocs/comp/release_editor

[root at musicbrainz.org]

Author: luks
Date: 2008-03-21 14:52:39 +0000 (Fri, 21 Mar 2008)
New Revision: 9788

Modified:
   mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/entermoderations-edit
   mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/init-editall
Log:
Partially fix "Edit All"

Modified: mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/entermoderations-edit
===================================================================
--- mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/entermoderations-edit	2008-03-21 14:27:58 UTC (rev 9787)
+++ mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/entermoderations-edit	2008-03-21 14:52:39 UTC (rev 9788)
@@ -351,7 +351,8 @@
 				{
 					$track = MusicBrainz::Server::Track->new($mb->{DBH});
 					$track->SetId($new_id);
-					$track->SetRelease($releaseid);
+					# FIXME-TRACKMERGING
+					#$track->SetRelease($releaseid);
 					$track->LoadFromId
 						or die "Error loading track\n";
 				}

Modified: mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/init-editall
===================================================================
--- mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/init-editall	2008-03-21 14:27:58 UTC (rev 9787)
+++ mb_server/branches/ReleaseTrack/htdocs/comp/release_editor/init-editall	2008-03-21 14:52:39 UTC (rev 9788)
@@ -80,13 +80,14 @@
 	# load tracks, and add into @t list.
 	my $track_artist;
 	my $i;
-	my @t = $release->LoadTracks;
+	my $tracks = $release->FindTracks();
 	$orig{"hasmultipletrackartists"} = $release->HasMultipleTrackArtists ? 1 : 0;
-	for $i (0 .. @t-1)
+	for $i (0 .. scalar(@$tracks)-1)
 	{
-		my $tr = $t[$i];
+		my $rtr = $tracks->[$i];
+		my $tr = $rtr->GetTrack;
 		$orig{"trackid$i"} = $tr->GetId;
-		$orig{"trackseq$i"} = $tr->GetSequence;
+		$orig{"trackseq$i"} = $rtr->GetSequence;
 		$orig{"track$i"} = $tr->GetName;
 		$orig{"tracklength$i"} = MusicBrainz::Server::Track::FormatTrackLength($tr->GetLength);
 
@@ -116,7 +117,7 @@
 		# -- not enabled yet, since there are no relationship editors either.
 		# %orig = $m->comp(".GetRelationships", %orig, id => $tr->GetId, index => $i);
 	}
-	$orig{"tracks"} = @t;
+	$orig{"tracks"} = scalar(@$tracks);
 	$orig{"v::edit_track_data"} = ($release->CanAddTrack or $release->CanRemoveTrack);
 
 	# load releases, and add into @t list.