Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

db/manifest

@@ -124,3 +124,4 @@ remove_is_downloadable.sql
 scores_mod_connections2.sql
 track_download_counts.sql
 scores_mod_users2.sql
+user_bio.sql

db/up/user_bio.sql

@@ -0,0 +1 @@
+ALTER TABLE users ALTER COLUMN biography TYPE TEXT;

ruby/lib/jam_ruby/connection_manager.rb

@@ -86,7 +86,14 @@ module JamRuby
           city = location.city
         end
 
-        conn.update(ip_address: ip_address, locidispid: locidispid, latitude: latitude, longitude: longitude, countrycode: countrycode, region:region, city: city)
+        conn.ip_address = ip_address
+        conn.locidispid = locidispid
+        conn.latitude = latitude
+        conn.longitude = longitude
+        conn.countrycode = countrycode
+        conn.region = region
+        conn.city = city
+        conn.save!(validate: false)
       end
 
       sql =<<SQL

web/app/assets/javascripts/jamkazam.js

@@ -232,6 +232,7 @@
         }
       }
       else {
+        logger.error("Unexpected ajax error: " + textStatus + ", msg:" + errorMessage);
         app.notify({title: textStatus, text: errorMessage, detail: jqXHR.responseText});
       }
     }

web/app/assets/javascripts/session.js

@@ -432,6 +432,7 @@
                 });
         }
 
+        // not leave session but leave screen
         function beforeLeave(data) {
           if(promptLeave) {
             var leaveSessionWarningDialog = new context.JK.LeaveSessionWarningDialog(context.JK.app,
@@ -1209,6 +1210,15 @@
             }
         }
 
+        function sessionLeave(evt) {
+          evt.preventDefault();
+
+          promptLeave = false;
+          context.window.location = '/client#/home';
+
+          return false;
+        }
+
         function sessionResync(evt) {
             evt.preventDefault();
             var response = context.jamClient.SessionAudioResync();
@@ -1388,7 +1398,8 @@
         }
 
         function events() {
-          $('#session-resync').on('click', sessionResync);
+            $('#session-leave').on('click', sessionLeave);
+            $('#session-resync').on('click', sessionResync);
             $('#session-contents').on("click", '[action="delete"]', deleteSession);
             $('#tracks').on('click', 'div[control="mute"]', toggleMute);
             $('#recording-start-stop').on('click', startStopRecording);

web/app/views/api_search/index.rabl

@@ -52,7 +52,7 @@ if @search.musicians_text_search?
       end
 
       node :pending_friend_request do |musician|
-        musician.pending_friend_request?(musician)
+        musician.pending_friend_request?(current_user)
       end
 
       node :biography do |musician|

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

@@ -8,7 +8,7 @@
         <span id="alert-message"></span>
         <br clear="left" /><br />
         <div class="left">
-            <a id="btn-alert-cancel" class="button-orange">CANCEL</a>
+            <a id="btn-alert-cancel" class="button-grey">CANCEL</a>
         </div>
         <div class="right">
             <a id="btn-alert-ok" class="button-orange"></a>

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

@@ -14,7 +14,7 @@
             <a id="btn-accept-leave-session" layout-action="close" class="button-orange">OK</a>
         </div>
         <div class="right">
-          <a id="btn-cancel-leave-session" layout-action="close" class="button-orange">CANCEL</a>
+          <a id="btn-cancel-leave-session" layout-action="close" class="button-grey">CANCEL</a>
         </div>
       <br clear="all" />
     </div>

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

@@ -13,7 +13,7 @@
             <a id="btn-accept-terms" layout-action="close" class="button-orange">ACCEPT</a>
         </div>
         <div class="right">
-            <a id="btn-cancel-terms" layout-action="close" class="button-orange">CANCEL</a>
+            <a id="btn-cancel-terms" layout-action="close" class="button-grey">CANCEL</a>
         </div>
         <br clear="all" />
     </div>

web/spec/support/utilities.rb

@@ -213,7 +213,7 @@ end
 def formal_leave_by user
   in_client(user) do
     find('#session-leave').trigger(:click)
-    find('#btn-accept-leave-session').trigger(:click)
+    #find('#btn-accept-leave-session').trigger(:click)
     expect(page).to have_selector('h2',    text: 'feed')
   end
 end