[mb-commits] branch, master, updated. Group release groups on artist pages by distinct secondary type sets

The branch, master has been updated
  discards 
http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=63c8abaf06547fec238d2578f11b1d11eaf0b7cc (commit)
       via 
http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=f9f31dc049316094877864c7f5764f867b165194 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (63c8abaf06547fec238d2578f11b1d11eaf0b7cc)
            \
             N -- N -- N (f9f31dc049316094877864c7f5764f867b165194)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Summary of changes:
 lib/MusicBrainz/Server/Data/ReleaseGroup.pm |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f9f31dc049316094877864c7f5764f867b165194
Author: Oliver Charles <oliver.g.charles <at> googlemail.com>
Date:   Fri May 25 15:08:00 2012 +0100

    Group release groups on artist pages by distinct secondary type sets

diff --git a/lib/MusicBrainz/Server/Data/ReleaseGroup.pm b/lib/MusicBrainz/Server/Data/ReleaseGroup.pm
index 8337d49..9b9e940 100644
--- a/lib/MusicBrainz/Server/Data/ReleaseGroup.pm
+++ b/lib/MusicBrainz/Server/Data/ReleaseGroup.pm
 <at>  <at>  -190,14 +190,21  <at>  <at>  sub find_by_artist
                     rgm.release_count,
                     rgm.rating_count,
                     rgm.rating,
-                    musicbrainz_collate(name.name) AS name_collate
+                    musicbrainz_collate(name.name) AS name_collate,
+                    array(
+                      SELECT name FROM release_group_secondary_type rgst
+                      JOIN release_group_secondary_type_join rgstj
+                        ON rgstj.secondary_type = rgst.id
+                      WHERE rgstj.release_group = rg.id
+                      ORDER BY name ASC
+                    ) secondary_types
                  FROM " . $self->_table . "
                     JOIN artist_credit_name acn
                         ON acn.artist_credit = rg.artist_credit
                      " . join(' ',  <at> $extra_joins) . "
                  WHERE " . join(" AND ",  <at> $conditions) . "
                  ORDER BY
-                    rg.type,
+                    rg.type, secondary_types,
                     rgm.first_release_date_year,
                     rgm.first_release_date_month,
                     rgm.first_release_date_day,
diff --git a/root/artist/index.tt b/root/artist/index.tt
index 4c753e2..15e12cc 100644
--- a/root/artist/index.tt
+++ b/root/artist/index.tt
 <at>  <at>  -52,14 +52,14  <at>  <at> 
         [%- WRAPPER 'components/with-pager.tt' -%]
             <form action="[% c.uri_for_action('/release_group/merge_queue') %]"
                 method="post">
-            [%- rg_type = 0 -%]
+            [%- rg_type = '' -%]
             [%- FOR rg=release_groups -%]
-                [% IF rg_type != rg.primary_type_id %]
-                    [% IF rg_type != 0 %]
+                [% IF rg_type != rg.type_name %]
+                    [% IF rg_type != '' %]
                         </tbody>
                     </table>
                     [% END %]
-                    <h3>[% l(rg.primary_type.name) || l('Other release groups') %]</h3>
+                    <h3>[% l(rg.type_name) || l('Other release groups') %]</h3>
                     <table class="tbl">
                         <thead>
                             <tr>
 <at>  <at>  -74,7 +74,7  <at>  <at> 
                             </tr>
                         </thead>
                         <tbody [%- rdfa_about_attr(rdfa_artist_curi(artist)) -%]>
-                    [% rg_type = rg.primary_type_id %]
+                    [% rg_type = rg.type_name %]
                 [% END %]
                 <tr [% ' class="ev"' IF loop.count % 2 == 0 %]
 		    [% rdfa_release_group_ns(rg) %]>
 <at>  <at>  -99,7 +99,7  <at>  <at> 
                     <td class="c">[% rg.release_count %]</td>
                 </tr>
             [%- END -%]
-            [% IF rg_type != 0 %]
+            [% IF rg_type != '' %]
                 </tbody>
             </table>
             [% END %]

-----------------------------------------------------------------------

hooks/post-receive
--

-- 
mb_server