fix race condition on user profile screen

web/app/assets/javascripts/profile.js

@@ -29,9 +29,8 @@
         }
 
         function afterShow(data) {
+            initUser();
             resetForm();
-            events();
-            renderActive();
         }
 
         function resetForm() {
@@ -47,11 +46,13 @@
             $('.profile-nav a.#profile-about-link').addClass('active');
         }
 
-        function getUser() {
+        function initUser() {
             if (user === null) {
                 rest.getUserDetail({"id": userId})
                     .done(function(response) {
                         user = response;
+                        events();
+                        renderActive();
                     })
                     .fail(app.ajaxError);
             }
@@ -59,7 +60,7 @@
         }
 
         function isMusician() {
-            if (getUser()) {
+            if (user) {
                 return user.musician === true;
             }
             return false;
@@ -114,7 +115,7 @@
         /****************** MAIN PORTION OF SCREEN *****************/
         // events for main screen
         function events() {
-        configureUserType();
+            configureUserType();
 
             // wire up panel clicks
             $('#profile-about-link').click(renderAbout);
@@ -160,7 +161,7 @@
         }
 
         function isFriend() {
-            return getUser() ? user.is_friend : false;
+            return user ? user.is_friend : false;
         }
 
         function friendRequestCallback() {
@@ -232,7 +233,7 @@
         }
 
         function isFollowing() {
-            return getUser() ? user.is_following : false;
+            return user ? user.is_following : false;
         }
 
         function configureFollowingButton(following) {
@@ -292,7 +293,7 @@
         function bindAbout() {
             $('#profile-instruments').empty();
 
-            if (getUser()) {
+            if (user !== null) {
                 // name
                 $('#profile-username').html(user.name);
 

web/app/controllers/api_users_controller.rb

@@ -56,8 +56,6 @@ class ApiUsersController < ApiController
   def update
 
     @user = User.find(params[:id])
-
-
     @user.first_name = params[:first_name] if params.has_key?(:first_name)
     @user.last_name = params[:last_name] if params.has_key?(:last_name)
     @user.gender = params[:gender] if params.has_key?(:gender)