0
@@ -31,7 +31,7 @@
0
   end
0
   
0
   def notice_hidden?(notice)
0
-    logged_in? && current_user. && current_user.settings.present?('hide_notice') && current_user.settings['hide_notice'].present?(notice)
0
+    logged_in? && current_user.present?(:settings) && current_user.settings.present?('hide_notice') && current_user.settings['hide_notice'].present?(notice)
0
   end
0
   
0
   def setting(symbol_or_string)

0
@@ -1,2 +1,2 @@
0
-<%= render :partial => 'assets/asset', :object => listen.asset if listen.asset%>
0
+<%= render :partial => 'playlists/asset', :object => listen.asset if listen.asset%>

0
@@ -4,7 +4,7 @@
0
   </div>
0
   
0
   <div class="scriptaculous">
0
-	  <%= render :partial => 'asset', :collection => @assets %>
0
+	  <%= render :partial => 'playlists/asset', :collection => @assets %>
0
   </div>
0
 </div>

0
@@ -8,6 +8,7 @@
0
 Spec::Runner.configure do |config|
0
   config.use_transactional_fixtures = true
0
   config.use_instantiated_fixtures  = false
0
+  config.integrate_views = true
0
   config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
0
 
0