Author: keschte
Date: 2006-06-24 14:44:00 +0000 (Sat, 24 Jun 2006)
New Revision: 7914
Modified:
mb_server/trunk/htdocs/comp/release_editor/entermoderations-add
mb_server/trunk/htdocs/comp/release_editor/form
mb_server/trunk/htdocs/comp/release_editor/review
Log:
fixed tickets #1582, #1639
Modified: mb_server/trunk/htdocs/comp/release_editor/entermoderations-add
===================================================================
--- mb_server/trunk/htdocs/comp/release_editor/entermoderations-add
2006-06-24 12:12:53 UTC (rev 7913)
+++ mb_server/trunk/htdocs/comp/release_editor/entermoderations-add
2006-06-24 14:44:00 UTC (rev 7914)
@@ -118,7 +118,41 @@
}
my $new = "";
- # build release sql.
+ # retrieve 1..n tracks from the arguments
+ my $trackdata = "";
+ my $realtracks = 0;
+ for (my $i = 0; $i < $tracks; $i++)
+ {
+ # skip deleted tracks, and use internal counter ($i) to
+ # handle track offsets.
+ if (!$ARGS{"trackdel$i"})
+ {
+ MusicBrainz::TrimInPlace($ARGS{"track$i"});
+ $trackdata .= "Track" . ($i + 1) . "=" .
$ARGS{"track$i"} . "\n";
+ if ($toc ne "")
+ {
+ my $dur = int((($offsets[$i+1] -
$offsets[$i])*1000)/75);
+ $trackdata .= "TrackDur" . ($i + 1) .
"=" . $dur . "\n";
+ }
+ else
+ {
+ my $length =
Track::UnformatTrackLength($ARGS{"tracklength$i"});
+ $length = 0 if $length < 0;
+ $trackdata .= "TrackDur" . ($i + 1) .
"=" . $length . "\n";
+ }
+ if ($hasmultipletrackartists)
+ {
+ my $new_artistid = $ARGS{sprintf
"tr%d_artistid", $i};
+ $trackdata .= "ArtistID" . ($i + 1) .
"=" . $new_artistid . "\n";
+ }
+ $realtracks++;
+ }
+ }
+ # update $tracks variable with real number of tracks
+ # ($tracks-number of deleted tracks)
+ $tracks = $realtracks;
+
+ # build release data.
if (!defined $artistid)
{
MusicBrainz::TrimInPlace($artistname, $sortname);
@@ -132,31 +166,8 @@
$new .= "TOC=$toc\n" if ($toc ne "");
$new .= "FreedbId=$freedbid\n" if ($freedbid ne "");
$new .= "FreedbCat=$freedbcat\n" if ($freedbcat ne "");
+ $new .= $trackdata;
-
- # retrieve 1..n tracks from the arguments
- for (my $i = 0; $i < $tracks; $i++)
- {
- MusicBrainz::TrimInPlace($ARGS{"track$i"});
- $new .= "Track" . ($i + 1) . "=" . $ARGS{"track$i"} .
"\n";
- if ($toc ne "")
- {
- my $dur = int((($offsets[$i+1] -
$offsets[$i])*1000)/75);
- $new .= "TrackDur" . ($i + 1) . "=" . $dur .
"\n";
- }
- else
- {
- my $length =
Track::UnformatTrackLength($ARGS{"tracklength$i"});
- $length = 0 if $length < 0;
- $new .= "TrackDur" . ($i + 1) . "=" . $length .
"\n";
- }
- if ($hasmultipletrackartists)
- {
- my $new_artistid = $ARGS{sprintf
"tr%d_artistid", $i};
- $new .= "ArtistID" . ($i + 1) . "=" .
$new_artistid . "\n";
- }
- }
-
# retrieve the release-dates and countries from the arguments
for my $j (sort map { /^rls_year-(\d+)$/ ? ($1) : () } keys
%ARGS)
{
Modified: mb_server/trunk/htdocs/comp/release_editor/form
===================================================================
--- mb_server/trunk/htdocs/comp/release_editor/form 2006-06-24 12:12:53 UTC
(rev 7913)
+++ mb_server/trunk/htdocs/comp/release_editor/form 2006-06-24 14:44:00 UTC
(rev 7914)
@@ -637,25 +637,8 @@
% # GUESS ALL, NEXT
% #
-------------------------------------------------------------------------
<tr>
- <td colspan="3"> </td>
+ <td colspan="5"> </td>
<td colspan="2">
- <& /comp/form/buttonsubmit,
- value =>
$ARGS{"SUBMIT_NEXT"},
- tabindex => ++$tabindex,
- validate => 1 &>
-
-
-
- <& /comp/form/buttonsubmit,
- value =>
$ARGS{"SUBMIT_STARTOVER"},
- tabindex =>
++$tabindex, &>
-
- <& /comp/form/buttonsubmit,
- value =>
$ARGS{"SUBMIT_CANCEL"},
- tabindex =>
++$tabindex, &>
-
- </td>
- <td colspan="2">
<& /comp/form/jsbutton, id =>
"BTN_ALL" &>
</td>
</tr>
@@ -735,6 +718,17 @@
value =>
$ARGS{"SUBMIT_NEXT"},
tabindex => ++$tabindex,
validate => 1 &>
+
+
+
+ <& /comp/form/buttonsubmit,
+ value =>
$ARGS{"SUBMIT_STARTOVER"},
+ tabindex =>
++$tabindex, &>
+
+ <& /comp/form/buttonsubmit,
+ value =>
$ARGS{"SUBMIT_CANCEL"},
+ tabindex =>
++$tabindex, &>
+
</td>
</tr>
</table>
Modified: mb_server/trunk/htdocs/comp/release_editor/review
===================================================================
--- mb_server/trunk/htdocs/comp/release_editor/review 2006-06-24 12:12:53 UTC
(rev 7913)
+++ mb_server/trunk/htdocs/comp/release_editor/review 2006-06-24 14:44:00 UTC
(rev 7914)
@@ -133,6 +133,10 @@
push @relorig, $rel;
}
+ # if editmode is true, we're editing a release, else
+ # we're adding one.
+ my $editmode = $ARGS{"v::action"} ne "/cdi/enter.html";
+
# prepare 1..n track objects
my @deletedtracks;
my @tracks;
@@ -226,6 +230,7 @@
<td class="autoedit"><& .isAutoEdit,
&ModDefs::MOD_ADD_ALBUM &></td>
</tr>
+% $releasechanges++;
% }
% else
% {
|
