[mb-commits] branch, data-nes, updated. Re-enable the loading of user ratings for work pages

The branch, data-nes has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=1c6dc21a402e865e2739ea01e366d3df68f50f57 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=2ac68eb349bbe4786b9ac4969ec4017d6fe2e93a (commit)

Summary of changes:
 lib/MusicBrainz/Server/Controller/Work.pm |    6 +++---
 lib/MusicBrainz/Server/Data/Rating.pm     |    2 +-
 2 files changed, 4 insertions(+), 4 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 1c6dc21a402e865e2739ea01e366d3df68f50f57
Author: Oliver Charles <[email protected]>
Date:   Tue Jan 15 13:14:33 2013 +0000

    Re-enable the loading of user ratings for work pages

diff --git a/lib/MusicBrainz/Server/Controller/Work.pm b/lib/MusicBrainz/Server/Controller/Work.pm
index d9c44e2..e9f6e91 100644
--- a/lib/MusicBrainz/Server/Controller/Work.pm
+++ b/lib/MusicBrainz/Server/Controller/Work.pm
@@ -41,9 +41,9 @@ after 'load' => sub
     my $work = $c->stash->{work};
     # $c->model('Work')->load_meta($work);
     # $c->model('ISWC')->load_for_works($work);
-    # if ($c->user_exists) {
-    #     $c->model('Work')->rating->load_user_ratings($c->user->id, $work);
-    # }
+    if ($c->user_exists) {
+        $c->model('Work')->rating->load_user_ratings($c->user->id, $work);
+    }
 };
 
 sub show : PathPart('') Chained('load')
diff --git a/lib/MusicBrainz/Server/Data/Rating.pm b/lib/MusicBrainz/Server/Data/Rating.pm
index a35b41f..c53ce7b 100644
--- a/lib/MusicBrainz/Server/Data/Rating.pm
+++ b/lib/MusicBrainz/Server/Data/Rating.pm
@@ -82,7 +82,7 @@ sub load_user_ratings
 {
     my ($self, $user_id, @objs) = @_;
 
-    my %id_to_obj = map { $_->id => $_ } @objs;
+    my %id_to_obj = map { $_->gid => $_ } @objs;
     my @ids = keys %id_to_obj;
     return unless @ids;
 

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


hooks/post-receive
-- 
mb_server