[mb-commits] r11157 - in mb_server/branches/TemplateToolkit: lib/MusicBrainz/Server/Controller root/user

[root at musicbrainz.org]

Author: acid2
Date: 2009-01-28 19:08:43 +0000 (Wed, 28 Jan 2009)
New Revision: 11157

Modified:
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/User.pm
   mb_server/branches/TemplateToolkit/root/user/profile.tt
Log:
Correctly display the users subscription preferencs. Fixes #4344

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/User.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/User.pm	2009-01-28 19:08:18 UTC (rev 11156)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Controller/User.pm	2009-01-28 19:08:43 UTC (rev 11157)
@@ -422,6 +422,8 @@
         };
     }
 
+    $c->stash->{preferences} = $c->model('User')->get_preferences_hash($user);
+
     $c->stash->{user    } = $user;
     $c->stash->{template} = 'user/profile.tt';
 }

Modified: mb_server/branches/TemplateToolkit/root/user/profile.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/user/profile.tt	2009-01-28 19:08:18 UTC (rev 11156)
+++ mb_server/branches/TemplateToolkit/root/user/profile.tt	2009-01-28 19:08:43 UTC (rev 11157)
@@ -84,7 +84,7 @@
     [% END %]
 
     [% WRAPPER property name="Subscriptions" %]
-        [% viewing_own_profile ? "Your" : user.name | html_entity %] subscriptions are [% user.public_subscriptions ? "public" : "private" %]
+        [% viewing_own_profile ? "Your" : user.name | html_entity %] subscriptions are [% preferences.get('subscriptions_public') ? "public" : "private" %]
     [% END %]
 
     [% WRAPPER property name="Subscribers" %]