VRFS-1555 VRFS-1556 do not show private sessions and recordings

web/app/views/api_music_sessions/history_show.rabl

@@ -1,6 +1,6 @@
 object @history
 
-attributes :id, :music_session_id, :description, :genres, :like_count, :comment_count, :created_at
+attributes :id, :music_session_id, :description, :fan_access, :genres, :like_count, :comment_count, :created_at
 
 node :share_url do |history|
   unless history.share_token.nil?

web/app/views/clients/index.html.erb

@@ -62,6 +62,8 @@
 <%= render "clients/banners/disconnected" %>
 <%= render "overlay_small" %>
 <%= render "help" %>
+<%= render "commentDialog" %>
+
 <div id="fb-root"></div>
 
 <script type="text/javascript">

web/app/views/layouts/web.html.erb

@@ -80,6 +80,7 @@
     <%= render "clients/hoverBand" %>
     <%= render "clients/hoverSession" %>
     <%= render "clients/hoverRecording" %>
+    <%= render "clients/commentDialog" %>
     
     <%= yield(:extra_dialogs) %>
 

web/app/views/music_sessions/show.html.erb

@@ -17,6 +17,7 @@
 <% end %>
 
 <div class="sessions-page">
+  <% if @music_session.fan_access %>
     <div class="landing-band">
       <% unless @music_session.band.nil? %>
         <div class="landing-avatar">
@@ -80,8 +81,12 @@
       <%= render :partial => "shared/track_details", :locals => {:tracks => @music_session.grouped_tracks} %>
     </div>
     <br clear="all" />
-</div>
 
+  <% else %>
+    <div class="left f20 teal"><strong>SESSION NOT FOUND</strong></div>
+  <% end %>
+
+</div>
 
   <% if true %>
     <div class="landing-sidebar" style="z-index:900;"><br />
@@ -102,7 +107,7 @@
       </div>
     </div>
   <% else %>
-<% if signed_in? %>
+    <% if signed_in? && @music_session.fan_access %>
       <% unless @music_session.band.nil? %>
         <%= render :partial => "shared/landing_sidebar", :locals => {:user => @music_session.band, :recent_history => @music_session.band.recent_history} %>
       <% else %>
@@ -113,6 +118,7 @@
     <% end %>
   <% end %>
 
+  <% if @music_session.fan_access %>
     <% content_for :after_black_bar do %>
       <br />
       <%= render :partial => "shared/comments", :locals => {:comments => @music_session.comments, :id => "txtSessionComment"} %>
@@ -130,3 +136,4 @@
             });
         </script>
     <% end %>
+  <% end %>

web/app/views/recordings/show.html.erb

@@ -18,6 +18,7 @@
 <% end %>
 
 <div class="recordings-page">
+<% if @claimed_recording.is_public %>
 <div class="landing-band">
   <% unless @claimed_recording.recording.band.blank? %>
     <div class="landing-avatar">
@@ -90,7 +91,13 @@
   <%= render :partial => "shared/track_details", :locals => {:tracks => @claimed_recording.recording.grouped_tracks} %>
 </div>
 <br clear="all" />
+
+  <% else %>
+    <div class="left f20 orange"><strong>RECORDING NOT FOUND</strong></div>
+  <% end %>
 </div>
+
+<% if @claimed_recording.is_public %>
   <% if signed_in? %>
     <% unless @claimed_recording.recording.band.nil? %>
       <%= render :partial => "shared/landing_sidebar", :locals => {:user => @claimed_recording.recording.band, :recent_history => @claimed_recording.recording.band.recent_history} %>
@@ -106,6 +113,7 @@
     <%= render :partial => "shared/comments", :locals => {:comments => @claimed_recording.recording.comments, :id => "txtRecordingComment"} %>
   <% end %>
 
+
   <% content_for :extra_dialogs do %>
       <%= render :partial => "clients/shareDialog" %>
   <% end %>
@@ -118,4 +126,5 @@
         });
       </script>
   <% end %>
+<% end %>