From e40b26d91953c0e545ac0e674fabacf81c102059 Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Tue, 5 Nov 2013 22:14:30 -0500
Subject: [PATCH 1/2] VRFS-837 check for undefined session

---
 web/app/assets/javascripts/findSession.js | 30 +++++++++++++----------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/web/app/assets/javascripts/findSession.js b/web/app/assets/javascripts/findSession.js
index 832f298e6..bc063cc73 100644
--- a/web/app/assets/javascripts/findSession.js
+++ b/web/app/assets/javascripts/findSession.js
@@ -152,13 +152,15 @@
         function containsInvitation(session) {
             var i, invitation = null;
 
-            if ("invitations" in session) {
-                // user has invitations for this session
-                for (i=0; i < session.invitations.length; i++) {
-                    invitation = session.invitations[i];
-                    // session contains an invitation for this user
-                    if (invitation.receiver_id == context.JK.currentUserId) {
-                        return true;
+            if (session !== undefined) {
+                if ("invitations" in session) {
+                    // user has invitations for this session
+                    for (i=0; i < session.invitations.length; i++) {
+                        invitation = session.invitations[i];
+                        // session contains an invitation for this user
+                        if (invitation.receiver_id == context.JK.currentUserId) {
+                            return true;
+                        }
                     }
                 }
             }
@@ -169,12 +171,14 @@
         function containsFriend(session) {
             var i, participant = null;
 
-            if ("participants" in session) {
-                for (i=0; i < session.participants.length; i++) {
-                    participant = session.participants[i];
-                    // this session participant is a friend
-                    if (participant !== null && participant !== undefined && participant.user.is_friend) {
-                        return true;
+            if (session !== undefined) {
+                if ("participants" in session) {
+                    for (i=0; i < session.participants.length; i++) {
+                        participant = session.participants[i];
+                        // this session participant is a friend
+                        if (participant !== null && participant !== undefined && participant.user.is_friend) {
+                            return true;
+                        }
                     }
                 }
             }

From 250933490b2f6b49d5ad0c6df2ad4f3096217127 Mon Sep 17 00:00:00 2001
From: Anthony Davis <anthony@jamkazam.com>
Date: Tue, 5 Nov 2013 22:21:12 -0600
Subject: [PATCH 2/2] removing 'unf' in admin Gemfile in case it's breaking the
 build

---
 admin/Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/Gemfile b/admin/Gemfile
index f80ab1d01..df321ebed 100644
--- a/admin/Gemfile
+++ b/admin/Gemfile
@@ -41,7 +41,7 @@ gem 'rails3-jquery-autocomplete'
 gem 'activeadmin'
 gem "meta_search", '>= 1.1.0.pre'
 gem 'fog',  "~> 1.3.1"
-gem 'unf' #optional fog dependency
+# gem 'unf' #optional fog dependency
 gem 'country-select'
 gem 'aasm', '3.0.16'
 gem 'postgres-copy'