From b0011137b9b3324317c353ee47e686a029da1ecc Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Tue, 1 Jul 2014 00:44:10 -0400
Subject: [PATCH] VRFS-1827 add Fan Page URL to session info page

---
 ruby/lib/jam_ruby/models/share_token.rb             | 2 --
 web/app/assets/javascripts/sessionList.js           | 2 +-
 web/app/views/clients/_rsvpSubmitDialog.html.haml   | 2 +-
 web/app/views/music_sessions/session_info.html.haml | 4 ++++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ruby/lib/jam_ruby/models/share_token.rb b/ruby/lib/jam_ruby/models/share_token.rb
index 18bb751e6..2f52afe41 100644
--- a/ruby/lib/jam_ruby/models/share_token.rb
+++ b/ruby/lib/jam_ruby/models/share_token.rb
@@ -1,7 +1,5 @@
 module JamRuby
   class ShareToken < ActiveRecord::Base
     belongs_to :shareable, :polymorphic => true
-
-
   end
 end
\ No newline at end of file
diff --git a/web/app/assets/javascripts/sessionList.js b/web/app/assets/javascripts/sessionList.js
index eb9fc07b8..116d30200 100644
--- a/web/app/assets/javascripts/sessionList.js
+++ b/web/app/assets/javascripts/sessionList.js
@@ -169,7 +169,7 @@
         }
       }
 
-      if ( (openRsvps || hasInvitation) && openSlots && !hasApprovedRsvp && currentUserHasRsvp ) {
+      if ( (openRsvps || hasInvitation) && openSlots && !hasApprovedRsvp && !currentUserHasRsvp ) {
         showRsvpLink = true;
       }
       else {
diff --git a/web/app/views/clients/_rsvpSubmitDialog.html.haml b/web/app/views/clients/_rsvpSubmitDialog.html.haml
index ee7ac355c..330c656b2 100644
--- a/web/app/views/clients/_rsvpSubmitDialog.html.haml
+++ b/web/app/views/clients/_rsvpSubmitDialog.html.haml
@@ -20,7 +20,7 @@
     %br/
     %br/
     .left
-      %a.button-grey{:href => 'TBD', :rel => 'external', :target => '_blank'} HELP
+      %a.button-grey{:href => 'http://jamkazam.desk.com', :rel => 'external', :target => '_blank'} HELP
     .right
       %a.button-grey{:id => 'btnCancel', 'layout-action' => 'close'} CANCEL
       %a.button-orange{:id => 'btnSubmitRsvp'} SUBMIT RSVP
\ No newline at end of file
diff --git a/web/app/views/music_sessions/session_info.html.haml b/web/app/views/music_sessions/session_info.html.haml
index f7d87261f..35948d079 100644
--- a/web/app/views/music_sessions/session_info.html.haml
+++ b/web/app/views/music_sessions/session_info.html.haml
@@ -60,6 +60,10 @@
         agreement (
         %a.gold{:href => "#{@music_session.legal_policy_url}", :target => "_blank"} View full legal details
         )
+      .clearall.left.w20.ib.mb10
+        %strong Fan Page:
+      .right.w75.ib.mb10.access
+        = share_token_url(@music_session.share_token.token)
 
     %br{clear:'all'}/