[mb-commits] r9783 - in mb_server/branches/ReleaseTrack: cgi-bin/MusicBrainz/Server/Moderation htdocs/comp/layout htdocs/comp/release htdocs/edit/album htdocs/edit/album/track htdocs/edit/track

[root at musicbrainz.org]

Author: luks
Date: 2008-03-17 09:29:10 +0000 (Mon, 17 Mar 2008)
New Revision: 9783

Added:
   mb_server/branches/ReleaseTrack/htdocs/edit/album/track/
   mb_server/branches/ReleaseTrack/htdocs/edit/album/track/edit.html
   mb_server/branches/ReleaseTrack/htdocs/edit/album/track/remove.html
Removed:
   mb_server/branches/ReleaseTrack/htdocs/edit/track/edit.html
   mb_server/branches/ReleaseTrack/htdocs/edit/track/remove.html
Modified:
   mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm
   mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm
   mb_server/branches/ReleaseTrack/htdocs/comp/layout/editformbegin
   mb_server/branches/ReleaseTrack/htdocs/comp/release/release_track
Log:
Release-track editing

Modified: mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm
===================================================================
--- mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm	2008-03-16 19:40:38 UTC (rev 9782)
+++ mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKNUM.pm	2008-03-17 09:29:10 UTC (rev 9783)
@@ -37,15 +37,16 @@
 {
 	my ($self, %opts) = @_;
 
-	my $track = $opts{'track'} or die;
+	my $release_track = $opts{'release_track'} or die;
+	my $track = $release_track->GetTrack or die;
 	my $newseq = $opts{'newseq'} or die;
 
 	$self->SetArtist($track->GetArtist);
-	$self->SetPrev($track->GetSequence);
+	$self->SetPrev($release_track->GetSequence);
 	$self->SetNew(0+$newseq);
 	$self->SetTable("albumjoin");
 	$self->SetColumn("sequence");
-	$self->SetRowId($track->GetSequenceId);
+	$self->SetRowId($release_track->GetId);
 }
 
 sub PostLoad

Modified: mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm
===================================================================
--- mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm	2008-03-16 19:40:38 UTC (rev 9782)
+++ mb_server/branches/ReleaseTrack/cgi-bin/MusicBrainz/Server/Moderation/MOD_EDIT_TRACKTIME.pm	2008-03-17 09:29:10 UTC (rev 9783)
@@ -73,12 +73,13 @@
     $tr->SetId($self->{trackid});
 	if ($tr->LoadFromId())
 	{
-        my $rel = MusicBrainz::Server::Release->new($self->{DBH});
-        $rel->SetId($tr->GetRelease());
-        if ($rel->LoadFromId())
-        {
-            return $rel->GetQuality();        
-        }
+	# FIXME-TRACKMERGING
+        #my $rel = MusicBrainz::Server::Release->new($self->{DBH});
+        #$rel->SetId($tr->GetRelease());
+        #if ($rel->LoadFromId())
+        #{
+        #    return $rel->GetQuality();        
+        #}
     }
     else
     {

Modified: mb_server/branches/ReleaseTrack/htdocs/comp/layout/editformbegin
===================================================================
--- mb_server/branches/ReleaseTrack/htdocs/comp/layout/editformbegin	2008-03-16 19:40:38 UTC (rev 9782)
+++ mb_server/branches/ReleaseTrack/htdocs/comp/layout/editformbegin	2008-03-17 09:29:10 UTC (rev 9783)
@@ -36,6 +36,7 @@
 	$release => undef
 	$artist => undef
 	$track => undef
+	$release_track => undef
 
 	# manual override of the above parameters:
 	$type => undef # artist or release
@@ -142,7 +143,7 @@
 		# general modpending flag is used.
 		if ($mp_type == &ModDefs::MOD_EDIT_TRACKNAME)
 		{
-			$mp = $track->GetAlbumJoinModPending;
+			$mp = $release_track->GetModPending;
 		}
 		else
 		{

Modified: mb_server/branches/ReleaseTrack/htdocs/comp/release/release_track
===================================================================
--- mb_server/branches/ReleaseTrack/htdocs/comp/release/release_track	2008-03-16 19:40:38 UTC (rev 9782)
+++ mb_server/branches/ReleaseTrack/htdocs/comp/release/release_track	2008-03-17 09:29:10 UTC (rev 9783)
@@ -165,15 +165,13 @@
 	if ($session{uid} and $showeditlinks)
 	{
 		$m->out(qq!<td class="links">!);
-       	$m->out(sprintf qq!<a href="/edit/track/edit.html?releaseid=%s&amp;trackid=%s" title="%s">Edit</a>!,
-				       	$release->GetId(),
-				       	$track->GetId(),
+       	$m->out(sprintf qq!<a href="/edit/album/track/edit.html?id=%s" title="%s">Edit</a>!,
+				       	$release_track->GetId(),
 				       	"Edit track title, number and length");
 		if ($release->CanRemoveTrack($release_track->GetSequence))
 		{
-			$m->out(sprintf qq! | <a href="/edit/track/remove.html?releaseid=%s&amp;trackid=%s" title="%s">Remove</a>!,
-							$release->GetId(),
-							$track->GetId(),
+			$m->out(sprintf qq! | <a href="/edit/album/track/remove.html?id=%s" title="%s">Remove</a>!,
+							$release_track->GetId(),
 							"Remove this track from the release");
 		}
 		else

Copied: mb_server/branches/ReleaseTrack/htdocs/edit/album/track/edit.html (from rev 9779, mb_server/branches/ReleaseTrack/htdocs/edit/track/edit.html)

Copied: mb_server/branches/ReleaseTrack/htdocs/edit/album/track/remove.html (from rev 9779, mb_server/branches/ReleaseTrack/htdocs/edit/track/remove.html)

Deleted: mb_server/branches/ReleaseTrack/htdocs/edit/track/edit.html

Deleted: mb_server/branches/ReleaseTrack/htdocs/edit/track/remove.html