From 81ad2c89b5264295071964fc67411dbe4741ae72 Mon Sep 17 00:00:00 2001
From: Steven Miers <steven.miers@gmail.com>
Date: Tue, 6 Jan 2015 17:14:33 -0600
Subject: [PATCH] VRFS-2610 : Fix bad API call that was throwing exception in
 console.

---
 .../javascripts/everywhere/everywhere.js      | 20 +++++++-------
 web/app/assets/javascripts/jam_rest.js        | 18 +++++++------
 web/app/assets/javascripts/jamkazam.js        | 26 ++++++++++---------
 3 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/web/app/assets/javascripts/everywhere/everywhere.js b/web/app/assets/javascripts/everywhere/everywhere.js
index c75d9c990..f89aeacba 100644
--- a/web/app/assets/javascripts/everywhere/everywhere.js
+++ b/web/app/assets/javascripts/everywhere/everywhere.js
@@ -194,15 +194,17 @@
   }
 
   function handleGettingStarted(app) {
-    app.user()
-      .done(function(userProfile) {
-      if (userProfile.show_whats_next &&
-        window.location.pathname.indexOf(gon.client_path) == 0 &&
-        !app.layout.isDialogShowing('getting-started'))
-      {
-        app.layout.showDialog('getting-started');
-      }
-    })
+    var user = app.user()
+    if(user) {
+      user.done(function(userProfile) {
+        if (userProfile.show_whats_next &&
+          window.location.pathname.indexOf(gon.client_path) == 0 &&
+          !app.layout.isDialogShowing('getting-started'))
+        {
+          app.layout.showDialog('getting-started');
+        }
+      })
+    }
   }
 
 })(window, jQuery);
diff --git a/web/app/assets/javascripts/jam_rest.js b/web/app/assets/javascripts/jam_rest.js
index a5611ba60..104911218 100644
--- a/web/app/assets/javascripts/jam_rest.js
+++ b/web/app/assets/javascripts/jam_rest.js
@@ -478,14 +478,16 @@
 
         function getUserDetail(options) {
             var id = getId(options);
-
-            var url = "/api/users/" + id;
-            return $.ajax({
-                type: "GET",
-                dataType: "json",
-                url: url,
-                processData: false
-            });
+            var detail = null;
+            if (id != null && typeof(id) != 'undefined') {
+                detail = $.ajax({
+                    type: "GET",
+                    dataType: "json",
+                    url: "/api/users/" + id,
+                    processData: false
+                });
+            }
+            return detail;
         }
 
         function getCities(options) {
diff --git a/web/app/assets/javascripts/jamkazam.js b/web/app/assets/javascripts/jamkazam.js
index a0a504c73..db0615510 100644
--- a/web/app/assets/javascripts/jamkazam.js
+++ b/web/app/assets/javascripts/jamkazam.js
@@ -362,20 +362,22 @@
       this.layout.handleDialogState();
 
       userDeferred = rest.getUserDetail();
-      userDeferred.done(this.updateUserCache)
+      if (userDeferred) {
+        userDeferred.done(this.updateUserCache)
 
-      if (opts.inClient) {
-        registerBadStateRecovered();
-        registerBadStateError();
-        registerDownloadAvailable();
-        registerDuplicateClientError();
-        context.JK.FaderHelpers.initialize();
-        context.window.onunload = this.unloadFunction;
+        if (opts.inClient) {
+          registerBadStateRecovered();
+          registerBadStateError();
+          registerDownloadAvailable();
+          registerDuplicateClientError();
+          context.JK.FaderHelpers.initialize();
+          context.window.onunload = this.unloadFunction;
 
-        userDeferred.fail(function(jqXHR) {
-          app.notify({title: "Unable to Load User", text: "You should reload the page."})
-        });
-      }
+          userDeferred.fail(function(jqXHR) {
+            app.notify({title: "Unable to Load User", text: "You should reload the page."})
+          });
+        }
+      } // if userDeferred
 
       $(document).triggerHandler('JAMKAZAM_READY', {app:app})