[mb-commits] r7908 - in mb_server/trunk/htdocs: comp/release edit/album

Author: keschte
Date: 2006-06-22 19:03:37 +0000 (Thu, 22 Jun 2006)
New Revision: 7908

Modified:
   mb_server/trunk/htdocs/comp/release/release_summary
   mb_server/trunk/htdocs/edit/album/editattributes.html
Log:
do not provide attributes links, handle attempt to edit NAT in 
editattributes.html fixed #1632


Modified: mb_server/trunk/htdocs/comp/release/release_summary
===================================================================
--- mb_server/trunk/htdocs/comp/release/release_summary 2006-06-22 18:54:04 UTC 
(rev 7907)
+++ mb_server/trunk/htdocs/comp/release/release_summary 2006-06-22 19:03:37 UTC 
(rev 7908)
@@ -95,7 +95,7 @@
        # 2. Release Language
        my $editwhat = " Language";
        my $nonalbum = $release->IsNonAlbumTracks();
-       if (!$nonalbum)
+       if (!$nonalbum)
        {
                my $language = $release->GetLanguage;
                my $script = $release->GetScript;
@@ -108,53 +108,53 @@
 
                $editwhat = "";
                $m->out("</a>&nbsp;]");
-       }
 
-       if ($session{"uid"} and $showmodlinks)
-       {
-               $m->out(sprintf qq!&nbsp;<a 
href="/edit/albumlanguage/edit.html?id=%s" title="%s">Edit%s</a>!,
-                                               $release->GetId(),
-                                               "Edit Language and Script of 
this Release",
-                                               $editwhat);
-       }
-       $m->out(qq!&nbsp;|</td>\n!);
+               if ($session{"uid"} and $showmodlinks)
+               {
+                       $m->out(sprintf qq!&nbsp;<a 
href="/edit/albumlanguage/edit.html?id=%s" title="%s">Edit%s</a>!,
+                                                       $release->GetId(),
+                                                       "Edit Language and 
Script of this Release",
+                                                       $editwhat);
+               }
+               $m->out(qq!&nbsp;|</td>\n!);
 
 
-       # 3. Release Attributes
-       $m->out(qq!<td class="attributes">[&nbsp;!);
-       if (!$nonalbum)
-       {
-               my @attrs = $release->GetAttributes();
-           $m->out(qq!<a href="/popup/ReleaseAttribute" 
title="POPUP::Release_Attributes::400::300">!);
-           if (scalar(@attrs) > 0)
-           {
-                       $m->out(sprintf qq!<span%s>!, 
$release->GetAttributeModPending() ? ' class="mp"' : "");
+               # 3. Release Attributes
+               $m->out(qq!<td class="attributes">[&nbsp;!);
+               if (!$nonalbum)
+               {
+                       my @attrs = $release->GetAttributes();
+                       $m->out(qq!<a href="/popup/ReleaseAttribute" 
title="POPUP::Release_Attributes::400::300">!);
+                       if (scalar(@attrs) > 0)
+                       {
+                               $m->out(sprintf qq!<span%s>!, 
$release->GetAttributeModPending() ? ' class="mp"' : "");
 
-                       my $count = 0;
-                       for my $attr (@attrs)
+                               my $count = 0;
+                               for my $attr (@attrs)
+                               {
+                                       my $attrname = 
$release->GetAttributeName($attr) || "?";
+                                       $m->out(",&nbsp;") if ($count > 0);
+                                       $m->out($attrname);
+                                       $count++;
+                               }
+
+                               $m->out("</span>");
+                       }
+                       else
                        {
-                               my $attrname = 
$release->GetAttributeName($attr) || "?";
-                               $m->out(",&nbsp;") if ($count > 0);
-                               $m->out($attrname);
-                               $count++;
+                               $m->out("None");
                        }
+                       $m->out("</a>&nbsp;]");
+               }
 
-               $m->out("</span>");
-               }
-               else
+               if ($session{"uid"} and $showmodlinks)
                {
-                       $m->out("None");
+                       $m->out(sprintf qq!&nbsp;<a 
href="/edit/album/editattributes.html?id=%s" title="%s">Edit</a>!,
+                                                       $release->GetId(),
+                                                       "Edit Language and 
Script of this Release",);
                }
-           $m->out("</a>&nbsp;]");
        }
 
-    if ($session{"uid"} and $showmodlinks)
-    {
-        $m->out(sprintf qq!&nbsp;<a 
href="/edit/album/editattributes.html?id=%s" title="%s">Edit</a>!,
-                                       $release->GetId(),
-                                       "Edit Language and Script of this 
Release",);
-    }
-
 </%perl>
 
                                        </td>

Modified: mb_server/trunk/htdocs/edit/album/editattributes.html
===================================================================
--- mb_server/trunk/htdocs/edit/album/editattributes.html       2006-06-22 
18:54:04 UTC (rev 7907)
+++ mb_server/trunk/htdocs/edit/album/editattributes.html       2006-06-22 
19:03:37 UTC (rev 7908)
@@ -35,12 +35,21 @@
                        or return $m->comp("/comp/badargs", 1, 1);
 
                my $release = $m->comp("/comp/loadrelease", $mb, $releaseid);
-               push @releaseobjs, $release;
 
-               # track release artists in artisthash
-               ++$artisthash{$release->GetArtist};
+               # skip [non-album tracks] release.
+               if (!$release->IsNonAlbumTracks)
+               {
+                       push @releaseobjs, $release;
+                       ++$artisthash{$release->GetArtist};
+               }
        }
 
+       # if no editable releases were provided
+       if (not @releaseobjs)
+       {
+               return $m->comp("/comp/layout/badarguments", text => "No 
editable releases provided.");
+       }
+
        # we got a form submission
        if ($submitvalue ne "")
        {